diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt index 64ff0e67b1..6d35379fd6 100644 --- a/CHOLMOD/CMakeLists.txt +++ b/CHOLMOD/CMakeLists.txt @@ -12,7 +12,7 @@ # cmake 3.22 is required to find the BLAS/LAPACK cmake_minimum_required ( VERSION 3.22 ) -set ( CHOLMOD_DATE "Apr XX, 2024" ) # FIXME NOW +set ( CHOLMOD_DATE "June XX, 2024" ) # FIXME NOW set ( CHOLMOD_VERSION_MAJOR 5 CACHE STRING "" FORCE ) set ( CHOLMOD_VERSION_MINOR 3 CACHE STRING "" FORCE ) set ( CHOLMOD_VERSION_SUB 0 CACHE STRING "" FORCE ) diff --git a/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf b/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf index bd9334823f..df3205b1cf 100644 Binary files a/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf and b/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf differ diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog index 1cd685de79..a54069a370 100644 --- a/CHOLMOD/Doc/ChangeLog +++ b/CHOLMOD/Doc/ChangeLog @@ -1,4 +1,4 @@ -Apr XX, 2024: version 5.3.0 FIXME NOW +June XX, 2024: version 5.3.0 FIXME NOW * added cholmod_query: to deterimine at run time which modules of CHOLMOD have been compiled into the libcholmod.so. diff --git a/CHOLMOD/Doc/cholmod_version.tex b/CHOLMOD/Doc/cholmod_version.tex index f1a7e5aeca..a5848d67ff 100644 --- a/CHOLMOD/Doc/cholmod_version.tex +++ b/CHOLMOD/Doc/cholmod_version.tex @@ -1,2 +1,2 @@ % version of SuiteSparse/CHOLMOD -\date{VERSION 5.3.0, Apr XX, 2024} +\date{VERSION 5.3.0, June XX, 2024} diff --git a/CHOLMOD/Include/cholmod.h b/CHOLMOD/Include/cholmod.h index 56776b3c0b..9d97dd582e 100644 --- a/CHOLMOD/Include/cholmod.h +++ b/CHOLMOD/Include/cholmod.h @@ -246,7 +246,7 @@ // version control //------------------------------------------------------------------------------ -#define CHOLMOD_DATE "Apr XX, 2024" +#define CHOLMOD_DATE "June XX, 2024" #define CHOLMOD_MAIN_VERSION 5 #define CHOLMOD_SUB_VERSION 3 #define CHOLMOD_SUBSUB_VERSION 0 diff --git a/CMakeLists.txt b/CMakeLists.txt index ebfd73fe8b..8edfcc9d0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ include ( SuiteSparsePolicy ) if ( SUITESPARSE_USE_SYSTEM_GRAPHBLAS ) list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "graphblas" ) - find_package ( GraphBLAS 9.2.0 REQUIRED ) + find_package ( GraphBLAS 9.3.0 REQUIRED ) else ( ) if ( "lagraph" IN_LIST SUITESPARSE_ENABLE_PROJECTS ) # LAGraph requires GraphBLAS. diff --git a/ChangeLog b/ChangeLog index f582583b3b..f530cda999 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ -May XX, 2024: version 7.8.0 FIXME NOW +June XX, 2024: version 7.8.0 FIXME NOW * ParU 1.0.0: first stable release * CHOLMOD 5.3.0: added cholmod_query, and #define's in cholmod.h, to query which Modules and features have been configured. - * GraphBLAS 9.2.0: simpler MATLAB install; sanitize environment variables + * GraphBLAS 9.3.0: simpler MATLAB install; sanitize environment variables * SPQR 4.3.4: changes to reflect updates to CHOLMOD * SPEX 3.1.1: control Python interface, fix build issues on Mac; this will likely be replace with SPEX 3.2.0 with additional updates, @@ -19,7 +19,7 @@ May XX, 2024: version 7.8.0 FIXME NOW CSparse 4.3.2 CXSparse 4.4.0 Example 1.8.0 * - GraphBLAS 9.2.0 * + GraphBLAS 9.3.0 * KLU 2.3.3 LDL 3.3.2 LAGraph 1.1.3 diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 99d33a8550..bc1a3c1304 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -53,7 +53,7 @@ message ( STATUS "MY prefix path: ${CMAKE_PREFIX_PATH}" ) #------------------------------------------------------------------------------- # cmake inserts the date and version number into Include/my.h: -set ( MY_DATE "Apr XX, 2024" ) # FIXME NOW +set ( MY_DATE "June XX, 2024" ) # FIXME NOW set ( MY_VERSION_MAJOR 1 ) set ( MY_VERSION_MINOR 8 ) set ( MY_VERSION_PATCH 0 ) @@ -95,7 +95,7 @@ find_package ( CCOLAMD 3.3.3 REQUIRED ) find_package ( CHOLMOD 5.3.0 REQUIRED ) find_package ( COLAMD 3.3.3 REQUIRED ) find_package ( CXSparse 4.4.0 REQUIRED ) -find_package ( GraphBLAS 9.2.0 ) +find_package ( GraphBLAS 9.3.0 ) find_package ( KLU 2.3.3 REQUIRED ) find_package ( KLU_CHOLMOD 2.3.3 REQUIRED ) find_package ( LDL 3.3.2 REQUIRED ) diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h index 037fd188b4..efa6ae94dc 100644 --- a/Example/Include/my_internal.h +++ b/Example/Include/my_internal.h @@ -56,8 +56,8 @@ #if ! defined (NO_GRAPHBLAS) #include "GraphBLAS.h" #if !defined ( GxB_SUITESPARSE_GRAPHBLAS ) || \ - GxB_IMPLEMENTATION < GxB_VERSION (9,2,0) - #error "This library requires SuiteSparse:GraphBLAS 9.2.0 or later" + GxB_IMPLEMENTATION < GxB_VERSION (9,3,0) + #error "This library requires SuiteSparse:GraphBLAS 9.3.0 or later" #endif #endif diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt index c74b8d17f2..38e83061b8 100644 --- a/GraphBLAS/CMakeLists.txt +++ b/GraphBLAS/CMakeLists.txt @@ -207,17 +207,35 @@ configure_file ( "Config/README.md.in" # include directories for both graphblas and the demos #------------------------------------------------------------------------------- -if ( GRAPHBLAS_COMPACT ) - # do not compile the FactoryKernels - include_directories ( Source/Template Source Include Source/Shared - Config xxHash Config lz4 zstd zstd/zstd_subset JITpackage - Source/Factories Demo/Include rmm_wrap Source/JitKernels ) -else ( ) - include_directories ( Source/Template Source Include Source/Shared - Config xxHash Config lz4 zstd zstd/zstd_subset JITpackage - Source/FactoryKernels - Source/Factories Demo/Include rmm_wrap Source/JitKernels ) -endif ( ) +include_directories ( ${PROJECT_SOURCE_DIR} Source Include Config + xxHash lz4 zstd zstd/zstd_subset JITpackage Demo/Include rmm_wrap + # include all Source/* folders that have include/ or template/ subfolders: + Source/apply + Source/assign + Source/builder + Source/builtin + Source/callback + Source/concat + Source/convert + Source/ewise + Source/hyper + Source/jit_kernels + Source/math + Source/memory + Source/monoid + Source/mxm + Source/ok + Source/omp + Source/print + Source/reduce + Source/select + Source/split + Source/slice + Source/transpose + Source/type + Source/wait + Source/werk + ) #------------------------------------------------------------------------------- # compiler options @@ -229,50 +247,21 @@ include ( GraphBLAS_compiler_options ) # dynamic graphblas library properties #------------------------------------------------------------------------------- -# Notes from Sebastien Villemot (sebastien@debian.org): -# SOVERSION policy: if a binary compiled against the old version of the shared -# library needs recompiling in order to work with the new version, then a -# SO_VERSION increase # is needed. Otherwise not. Examples of the changes that -# require a SO_VERSION increase: -# -# - a public function or static variable is removed -# - the prototype of a public function changes -# - the integer value attached to a public #define or enum changes -# - the fields of a public structure are modified -# -# Examples of changes that do not require a SO_VERSION increase: -# -# - a new public function or static variable is added -# - a private function or static variable is removed or modified -# - changes in the internals of a structure that is opaque to the calling -# program (i.e. is only a pointer manipulated through public functions of -# the library) -# - a public enum is extended (by adding a new item at the end, but without -# changing the already existing items) +file ( GLOB GRAPHBLAS_SOURCES "PreJIT/*.c" "Config/*.c" "Source/*/*.c" ) + +if ( NOT GRAPHBLAS_COMPACT ) + # compile the FactoryKernels + file ( GLOB GRAPHBLAS_FACTORYKERNELS "FactoryKernels/*.c" ) + list ( APPEND GRAPHBLAS_SOURCES ${GRAPHBLAS_FACTORYKERNELS} ) +endif ( ) if ( GRAPHBLAS_USE_JIT ) # generate compressed JIT sources add_subdirectory ( JITpackage ) - if ( GRAPHBLAS_COMPACT ) - # with the JIT; but do not compile the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" "Config/*.c" "PreJIT/*.c" ) - else ( ) - # with the JIT and the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" "Config/*.c" "PreJIT/*.c" - "Source/FactoryKernels/*.c" ) - endif ( ) # GLOB does not include files that do not yet exist, so prepend # the GB_JITpackage.c file here: - list ( PREPEND GRAPHBLAS_SOURCES $ ) -else ( ) - if ( GRAPHBLAS_COMPACT ) - # no JIT, do not compile the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" "Config/*.c" "PreJIT/*.c" ) - else ( ) - # no JIT, but do compile the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" "Config/*.c" "PreJIT/*.c" - "Source/FactoryKernels/*.c" ) - endif ( ) + list ( PREPEND GRAPHBLAS_SOURCES + $ ) endif ( ) if ( BUILD_SHARED_LIBS ) diff --git a/GraphBLAS/CUDA/CMakeLists.txt b/GraphBLAS/CUDA/CMakeLists.txt index c0c74d825d..b4bbf21a87 100644 --- a/GraphBLAS/CUDA/CMakeLists.txt +++ b/GraphBLAS/CUDA/CMakeLists.txt @@ -38,29 +38,20 @@ set_target_properties ( GraphBLAS_CUDA PROPERTIES C_STANDARD 11 C_STANDARD_REQUIRED ON ) -# find rmm_wrap, the malloc/calloc/realloc/free wrapper for the Rapids -# memory manager -set ( RMM_WRAP_INCLUDES "../rmm_wrap" ) - -message ( STATUS "RMM_WRAP_INCLUDES: ${RMM_WRAP_INCLUDES}" ) -set ( GRAPHBLAS_CUDA_INCLUDES - ${RMM_WRAP_INCLUDES} - ../Source - ../Source/Shared - ../Source/Template - ../Source/Factories - Template - ../Include - ../CUDA ) - -message ( STATUS "GraphBLAS CUDA includes: ${GRAPHBLAS_CUDA_INCLUDES}" ) - #------------------------------------------------------------------------------- # GraphBLAS_CUDA properties #------------------------------------------------------------------------------- target_include_directories ( GraphBLAS_CUDA PRIVATE - ${GRAPHBLAS_CUDA_INCLUDES}) + ${PROJECT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/../ + include + ../Include + ../rmm_wrap + ../Source + ../Source/builtin + ) + set_target_properties ( GraphBLAS_CUDA PROPERTIES POSITION_INDEPENDENT_CODE ON ) set_target_properties ( GraphBLAS_CUDA PROPERTIES CUDA_SEPARABLE_COMPILATION ON ) # FIXME: use SUITESPARSE_CUDA_ARCHITECTURES diff --git a/GraphBLAS/CUDA/GB_cuda.hpp b/GraphBLAS/CUDA/GB_cuda.hpp index baa0bc23ee..b833105393 100644 --- a/GraphBLAS/CUDA/GB_cuda.hpp +++ b/GraphBLAS/CUDA/GB_cuda.hpp @@ -11,23 +11,14 @@ #ifndef GB_CUDA_HPP #define GB_CUDA_HPP -extern "C" -{ - #include "GB_dev.h" - #include "GB_compiler.h" - #include "GB_cpu_features.h" - #include "GB_warnings.h" -} - -#include "GraphBLAS_cuda.hpp" +#include "CUDA/include/GraphBLAS_cuda.hpp" extern "C" { #include #include #include "GB.h" - #include "GB_stringify.h" - #include "GB_iceil.h" + #include "jitifyer/GB_stringify.h" } // Finally, include the CUDA definitions @@ -40,8 +31,8 @@ extern "C" #include #include -#include "GB_cuda_error.hpp" -#include "GB_cuda_timer.hpp" +#include "CUDA/include/GB_cuda_error.hpp" +#include "CUDA/include/GB_cuda_timer.hpp" //------------------------------------------------------------------------------ // prefetch and memadvise diff --git a/GraphBLAS/CUDA/GB_cuda_AxB.hpp b/GraphBLAS/CUDA/GB_cuda_AxB.hpp index 19a319777e..12737d882e 100644 --- a/GraphBLAS/CUDA/GB_cuda_AxB.hpp +++ b/GraphBLAS/CUDA/GB_cuda_AxB.hpp @@ -11,7 +11,6 @@ #define GB_CUDA_AXB_H #include "GB_cuda.hpp" -#include "GB_hash.h" GrB_Info GB_cuda_AxB_dot3_jit ( diff --git a/GraphBLAS/CUDA/GB_cuda_apply_binop_branch.cpp b/GraphBLAS/CUDA/GB_cuda_apply_binop_branch.cpp index ccc58de024..df5f7ce163 100644 --- a/GraphBLAS/CUDA/GB_cuda_apply_binop_branch.cpp +++ b/GraphBLAS/CUDA/GB_cuda_apply_binop_branch.cpp @@ -1,4 +1,3 @@ -#include "GraphBLAS_cuda.hpp" #include "GB_cuda.hpp" bool GB_cuda_apply_binop_branch diff --git a/GraphBLAS/CUDA/GB_cuda_apply_unop_branch.cpp b/GraphBLAS/CUDA/GB_cuda_apply_unop_branch.cpp index c7b6a8457a..40730f8631 100644 --- a/GraphBLAS/CUDA/GB_cuda_apply_unop_branch.cpp +++ b/GraphBLAS/CUDA/GB_cuda_apply_unop_branch.cpp @@ -1,4 +1,3 @@ -#include "GraphBLAS_cuda.hpp" #include "GB_cuda.hpp" bool GB_cuda_apply_unop_branch @@ -16,4 +15,4 @@ bool GB_cuda_apply_unop_branch return false ; } return true ; -} \ No newline at end of file +} diff --git a/GraphBLAS/CUDA/GB_cuda_colscale_branch.cpp b/GraphBLAS/CUDA/GB_cuda_colscale_branch.cpp index 82897d53d8..0a4123814c 100644 --- a/GraphBLAS/CUDA/GB_cuda_colscale_branch.cpp +++ b/GraphBLAS/CUDA/GB_cuda_colscale_branch.cpp @@ -1,4 +1,3 @@ -#include "GraphBLAS_cuda.hpp" #include "GB_cuda.hpp" bool GB_cuda_colscale_branch diff --git a/GraphBLAS/CUDA/GB_cuda_rowscale_branch.cpp b/GraphBLAS/CUDA/GB_cuda_rowscale_branch.cpp index f9c492c239..d3cb513247 100644 --- a/GraphBLAS/CUDA/GB_cuda_rowscale_branch.cpp +++ b/GraphBLAS/CUDA/GB_cuda_rowscale_branch.cpp @@ -1,4 +1,3 @@ -#include "GraphBLAS_cuda.hpp" #include "GB_cuda.hpp" bool GB_cuda_rowscale_branch diff --git a/GraphBLAS/CUDA/GB_cuda_upscale_identity.cpp b/GraphBLAS/CUDA/GB_cuda_upscale_identity.cpp index c034f4b4ad..df477444cb 100644 --- a/GraphBLAS/CUDA/GB_cuda_upscale_identity.cpp +++ b/GraphBLAS/CUDA/GB_cuda_upscale_identity.cpp @@ -12,10 +12,6 @@ // scaling up the 1-byte and 2-byte cases to 4-bytes. #include "GB_cuda.hpp" -extern "C" -{ - #include "GB_binop.h" -} void GB_cuda_upscale_identity ( diff --git a/GraphBLAS/CUDA/Template/GB_h_subset.cuh b/GraphBLAS/CUDA/Template/GB_h_subset.cuh deleted file mode 100644 index f371da6041..0000000000 --- a/GraphBLAS/CUDA/Template/GB_h_subset.cuh +++ /dev/null @@ -1,77 +0,0 @@ -//------------------------------------------------------------------------------ -// GraphBLAS/CUDA/Template/GB_h_subset.cuh: subset of GB.h -//------------------------------------------------------------------------------ - -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -//------------------------------------------------------------------------------ - -// Note the header guard is the same as GB.h: -#ifndef GB_H -#define GB_H - -// from GB_iceil.h: -#define GB_ICEIL(a,b) (((a) + (b) - 1) / (b)) -// from GB_imin.h: -#define GB_IMAX(x,y) (((x) > (y)) ? (x) : (y)) -#define GB_IMIN(x,y) (((x) < (y)) ? (x) : (y)) -// from GB_zombie.h: -#define GB_FLIP(i) (-(i)-2) -#define GB_IS_FLIPPED(i) ((i) < 0) -#define GB_IS_ZOMBIE(i) ((i) < 0) -#define GB_IS_NOT_FLIPPED(i) ((i) >= 0) -#define GB_UNFLIP(i) (((i) < 0) ? GB_FLIP(i) : (i)) -#define GBI_UNFLIP(Ai,p,avlen) \ - ((Ai == NULL) ? ((p) % (avlen)) : GB_UNFLIP (Ai [p])) - -#include "GB_index.h" -#include "GB_partition.h" -#include "GB_pun.h" -#include "GB_opaque.h" -#include "GB_int64_mult.h" -#define GB_HAS_CMPLX_MACROS 1 -#include "GB_complex.h" -#include "GB_memory_macros.h" - -// version for the GPU, with fewer branches -#define GB_TRIM_BINARY_SEARCH(i,X,pleft,pright) \ -{ \ - /* binary search of X [pleft ... pright] for integer i */ \ - while (pleft < pright) \ - { \ - int64_t pmiddle = (pleft + pright) >> 1 ; \ - bool less = (X [pmiddle] < i) ; \ - pleft = less ? (pmiddle+1) : pleft ; \ - pright = less ? pright : pmiddle ; \ - } \ - /* binary search is narrowed down to a single item */ \ - /* or it has found the list is empty */ \ - ASSERT (pleft == pright || pleft == pright + 1) ; \ -} - -#define GB_BINARY_SEARCH(i,X,pleft,pright,found) \ -{ \ - GB_TRIM_BINARY_SEARCH (i, X, pleft, pright) ; \ - found = (pleft == pright && X [pleft] == i) ; \ -} - -#define GB_SPLIT_BINARY_SEARCH(i,X,pleft,pright,found) \ -{ \ - GB_BINARY_SEARCH (i, X, pleft, pright, found) \ - if (!found && (pleft == pright)) \ - { \ - if (i > X [pleft]) \ - { \ - pleft++ ; \ - } \ - else \ - { \ - pright++ ; \ - } \ - } \ -} - - -#endif - diff --git a/GraphBLAS/CUDA/Template/GraphBLAS_h_subset.cuh b/GraphBLAS/CUDA/Template/GraphBLAS_h_subset.cuh deleted file mode 100644 index 53085666b5..0000000000 --- a/GraphBLAS/CUDA/Template/GraphBLAS_h_subset.cuh +++ /dev/null @@ -1,135 +0,0 @@ -//------------------------------------------------------------------------------ -// GraphBLAS/CUDA/Template/GraphBLAS_h_subset.cuh: subset of GraphBLAS.h -//------------------------------------------------------------------------------ - -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -//------------------------------------------------------------------------------ - -// Note the header gaurd is the same as GraphBLAS.h: -#ifndef GRAPHBLAS_H -#define GRAPHBLAS_H - -typedef enum -{ - - GrB_SUCCESS = 0, // all is well - - //-------------------------------------------------------------------------- - // informational codes, not an error: - //-------------------------------------------------------------------------- - - GrB_NO_VALUE = 1, // A(i,j) requested but not there - GxB_EXHAUSTED = 7089, // iterator is exhausted - - //-------------------------------------------------------------------------- - // errors: - //-------------------------------------------------------------------------- - - GrB_UNINITIALIZED_OBJECT = -1, // object has not been initialized - GrB_NULL_POINTER = -2, // input pointer is NULL - GrB_INVALID_VALUE = -3, // generic error; some value is bad - GrB_INVALID_INDEX = -4, // row or column index is out of bounds - GrB_DOMAIN_MISMATCH = -5, // object domains are not compatible - GrB_DIMENSION_MISMATCH = -6, // matrix dimensions do not match - GrB_OUTPUT_NOT_EMPTY = -7, // output matrix already has values - GrB_NOT_IMPLEMENTED = -8, // method not implemented - GrB_ALREADY_SET = -9, // field already written to - GrB_PANIC = -101, // unknown error - GrB_OUT_OF_MEMORY = -102, // out of memory - GrB_INSUFFICIENT_SPACE = -103, // output array not large enough - GrB_INVALID_OBJECT = -104, // object is corrupted - GrB_INDEX_OUT_OF_BOUNDS = -105, // row or col index out of bounds - GrB_EMPTY_OBJECT = -106 // an object does not contain a value - -} -GrB_Info ; - -#undef restrict -#undef GB_restrict -#define GB_restrict __restrict__ -#define restrict GB_restrict - -#include -#include -#include - -#undef GB_GLOBAL -#define GB_GLOBAL extern - -// GB_STR: convert the content of x into a string "x" -#define GB_XSTR(x) GB_STR(x) -#define GB_STR(x) #x - -#undef GxB_MAX_NAME_LEN -#define GxB_MAX_NAME_LEN 128 - -typedef uint64_t GrB_Index ; -typedef struct GB_Descriptor_opaque *GrB_Descriptor ; -typedef struct GB_Type_opaque *GrB_Type ; -typedef struct GB_UnaryOp_opaque *GrB_UnaryOp ; -typedef struct GB_BinaryOp_opaque *GrB_BinaryOp ; -typedef struct GB_IndexUnaryOp_opaque *GrB_IndexUnaryOp ; -typedef struct GB_Monoid_opaque *GrB_Monoid ; -typedef struct GB_Semiring_opaque *GrB_Semiring ; -typedef struct GB_Scalar_opaque *GrB_Scalar ; -typedef struct GB_Vector_opaque *GrB_Vector ; -typedef struct GB_Matrix_opaque *GrB_Matrix ; -typedef struct GB_Context_opaque *GxB_Context ; -typedef struct GB_Global_opaque *GrB_Global ; -typedef struct GB_Iterator_opaque *GxB_Iterator ; - -#define GxB_HYPERSPARSE 1 // store matrix in hypersparse form -#define GxB_SPARSE 2 // store matrix as sparse form (compressed vector) -#define GxB_BITMAP 4 // store matrix as a bitmap -#define GxB_FULL 8 // store matrix as full; all entries must be present - -typedef void (*GxB_unary_function) (void *, const void *) ; -typedef void (*GxB_binary_function) (void *, const void *, const void *) ; - -typedef bool (*GxB_select_function) // return true if A(i,j) is kept -( - GrB_Index i, // row index of A(i,j) - GrB_Index j, // column index of A(i,j) - const void *x, // value of A(i,j) - const void *thunk // optional input for select function -) ; - -typedef void (*GxB_index_unary_function) -( - void *z, // output value z, of type ztype - const void *x, // input value x of type xtype; value of v(i) or A(i,j) - GrB_Index i, // row index of A(i,j) - GrB_Index j, // column index of A(i,j), or zero for v(i) - const void *y // input scalar y -) ; - -#define GxB_GLOBAL_GPU_ID 26 - -typedef enum -{ - // for all GrB_Descriptor fields: - GxB_DEFAULT = 0, // default behavior of the method - - // for GrB_OUTP only: - GrB_REPLACE = 1, // clear the output before assigning new values to it - - // for GrB_MASK only: - GrB_COMP = 2, // use the structural complement of the input - GrB_SCMP = 2, // same as GrB_COMP (historical; use GrB_COMP instead) - GrB_STRUCTURE = 4, // use the only pattern of the mask, not its values - - // for GrB_INP0 and GrB_INP1 only: - GrB_TRAN = 3, // use the transpose of the input - - // for GxB_AxB_METHOD only: - GxB_AxB_GUSTAVSON = 1001, // gather-scatter saxpy method - GxB_AxB_DOT = 1003, // dot product - GxB_AxB_HASH = 1004, // hash-based saxpy method - GxB_AxB_SAXPY = 1005 // saxpy method (any kind) -} -GrB_Desc_Value ; - -#endif - diff --git a/GraphBLAS/CUDA/Template/GB_cuda_atomics.cuh b/GraphBLAS/CUDA/include/GB_cuda_atomics.cuh similarity index 99% rename from GraphBLAS/CUDA/Template/GB_cuda_atomics.cuh rename to GraphBLAS/CUDA/include/GB_cuda_atomics.cuh index 6152d003e9..c4655c885e 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_atomics.cuh +++ b/GraphBLAS/CUDA/include/GB_cuda_atomics.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/Template/GB_cuda_atomics.cuh: CUDA atomics for GraphBLAS +// GraphBLAS/CUDA/template/GB_cuda_atomics.cuh: CUDA atomics for GraphBLAS //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. diff --git a/GraphBLAS/CUDA/Template/GB_cuda_error.hpp b/GraphBLAS/CUDA/include/GB_cuda_error.hpp similarity index 100% rename from GraphBLAS/CUDA/Template/GB_cuda_error.hpp rename to GraphBLAS/CUDA/include/GB_cuda_error.hpp diff --git a/GraphBLAS/CUDA/Template/GB_cuda_kernel.cuh b/GraphBLAS/CUDA/include/GB_cuda_kernel.cuh similarity index 69% rename from GraphBLAS/CUDA/Template/GB_cuda_kernel.cuh rename to GraphBLAS/CUDA/include/GB_cuda_kernel.cuh index e37259530d..1823a0bb6c 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_kernel.cuh +++ b/GraphBLAS/CUDA/include/GB_cuda_kernel.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/Template/GB_cuda_kernel.cuh: definitions for CUDA kernels +// GraphBLAS/CUDA/template/GB_cuda_kernel.cuh: definitions for CUDA kernels //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -36,15 +36,6 @@ using namespace cooperative_groups ; #undef ASSERT #define ASSERT(x) -//------------------------------------------------------------------------------ -// NVIDIA warp size -//------------------------------------------------------------------------------ - -#define WARPSIZE 32 -#define LOG2_WARPSIZE 5 - -//------------------------------------------------------------------------------ - // for internal static inline functions #undef GB_STATIC_INLINE #define GB_STATIC_INLINE static __device__ __inline__ @@ -53,27 +44,34 @@ using namespace cooperative_groups ; // subset of GraphBLAS.h //------------------------------------------------------------------------------ -#include "GraphBLAS_h_subset.cuh" - -//------------------------------------------------------------------------------ -// subset of GB.h -//------------------------------------------------------------------------------ - -#include "GB_h_subset.cuh" +#include "GraphBLAS_cuda.hpp" //------------------------------------------------------------------------------ -// final #include files +// internal #include files //------------------------------------------------------------------------------ -#include "GB_cuda_error.hpp" -#include "GB_printf_kernels.h" -#include "GB_cuda_atomics.cuh" -#include "GB_hash.h" -#include "GB_hyper_hash_lookup.h" - extern "C" { - #include "GB_werk.h" - #include "GB_callback.h" + #include "include/GB_pun.h" + #include "include/GB_partition.h" + #include "include/GB_binary_search.h" + #include "include/GB_zombie.h" + #include "include/GB_int64_mult.h" + #include "include/GB_index.h" + #include "include/GB_hash.h" + #include "include/GB_complex.h" + #include "include/GB_iceil.h" + #include "include/GB_math_macros.h" + #include "include/GB_memory_macros.h" + #include "include/GB_printf_kernels.h" + #include "include/GB_opaque.h" + #include "include/GB_werk.h" + #include "include/GB_callback_proto.h" + #include "include/GB_saxpy3task_struct.h" + #include "include/GB_callback.h" + #include "include/GB_hyper_hash_lookup.h" } +#include "GB_cuda_error.hpp" +#include "GB_cuda_atomics.cuh" + diff --git a/GraphBLAS/CUDA/Template/GB_cuda_timer.hpp b/GraphBLAS/CUDA/include/GB_cuda_timer.hpp similarity index 100% rename from GraphBLAS/CUDA/Template/GB_cuda_timer.hpp rename to GraphBLAS/CUDA/include/GB_cuda_timer.hpp diff --git a/GraphBLAS/CUDA/GraphBLAS_cuda.hpp b/GraphBLAS/CUDA/include/GraphBLAS_cuda.hpp similarity index 84% rename from GraphBLAS/CUDA/GraphBLAS_cuda.hpp rename to GraphBLAS/CUDA/include/GraphBLAS_cuda.hpp index 7de3cb0398..edd49b98f8 100644 --- a/GraphBLAS/CUDA/GraphBLAS_cuda.hpp +++ b/GraphBLAS/CUDA/include/GraphBLAS_cuda.hpp @@ -7,6 +7,13 @@ //------------------------------------------------------------------------------ +extern "C" +{ + #include "include/GB_dev.h" + #include "include/GB_compiler.h" + #include "include/GB_warnings.h" +} + #ifndef GXB_COMPLEX_H #define GXB_COMPLEX_H @@ -25,3 +32,5 @@ #include "GraphBLAS.h" #undef I +#define restrict GB_restrict + diff --git a/GraphBLAS/CUDA/Template/GB_cuda_ek_slice.cuh b/GraphBLAS/CUDA/template/GB_cuda_ek_slice.cuh similarity index 99% rename from GraphBLAS/CUDA/Template/GB_cuda_ek_slice.cuh rename to GraphBLAS/CUDA/template/GB_cuda_ek_slice.cuh index cf3f4c4f30..8d7036a93b 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_ek_slice.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_ek_slice.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/Template/GB_cuda_ek_slice.cuh +// GraphBLAS/CUDA/template/GB_cuda_ek_slice.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh similarity index 98% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh index 5fce319bf1..0239e706de 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_dense_phase1.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_dense_phase1.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase1.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase1.cuh similarity index 99% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase1.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase1.cuh index 5be6c2a03c..efbb25bf12 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase1.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase1.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase1.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase1.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase2.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2.cuh similarity index 97% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase2.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2.cuh index 171347573f..06eb999a86 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase2.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_GB_AxB_dot3_phase2.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_GB_AxB_dot3_phase2.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -140,7 +140,7 @@ __global__ void GB_cuda_AxB_dot3_phase2_kernel } this_thread_block().sync(); - s [b] = GB_cuda_warp_sum_uint64 (tile, s [b]) ; + s [b] = GB_cuda_tile_sum_uint64 (tile, s [b]) ; } if (threadIdx.x == 0) diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase2end.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2end.cuh similarity index 98% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase2end.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2end.cuh index 6a64c7845c..cf4ea657da 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase2end.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2end.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase2end.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase2end.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh similarity index 98% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh index c36f35d0cc..fe240b923f 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_dndn.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -185,7 +185,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_dndn_kernel #if !GB_C_ISO // FIXME: the ANY monoid needs the cij_exists for each thread - cij = GB_cuda_warp_reduce_ztype (tile, cij) ; + cij = GB_cuda_tile_reduce_ztype (tile, cij) ; #endif // FIXME: if A and B are full, and GB_MASK_STRUCT is true, cij_exists diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh similarity index 98% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh index 3fb4ead9e8..eeebf2e878 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase3_mp.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_mp.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -95,7 +95,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_mp_kernel #endif // zombie count - int64_t zc = 0; + uint64_t zc = 0; // set thread ID // int tid_global = threadIdx.x+ blockDim.x* blockIdx.x; @@ -329,7 +329,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_mp_kernel if (cij_exists) { // FIXME: the ANY monoid needs the cij_exists for each thread - cij = GB_cuda_warp_reduce_ztype (tile, cij) ; + cij = GB_cuda_tile_reduce_ztype (tile, cij) ; } #endif @@ -358,7 +358,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_mp_kernel if( tid ==0 && zc > 0) { - GB_cuda_atomic_add ( &(C->nzombies), (uint64_t) zc) ; + GB_cuda_atomic_add ( &(C->nzombies), zc) ; } } diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh similarity index 98% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh index c0e04e9361..0bc7092f6d 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_spdn.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -263,7 +263,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_spdn_kernel if (cij_exists) { // FIXME: the ANY monoid needs cij_exists for each thread - cij = GB_cuda_warp_reduce_ztype (tile, cij) ; + cij = GB_cuda_tile_reduce_ztype (tile, cij) ; } #endif diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh similarity index 98% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh index 018df8c1ae..1258e1894c 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsdn.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -269,7 +269,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_vsdn_kernel // sum up the zombie count: thread_block_tile tile = tiled_partition (this_thread_block ()) ; - zc += GB_cuda_warp_sum_uint64 (tile, my_nzombies) ; + zc += GB_cuda_tile_sum_uint64 (tile, my_nzombies) ; } if (threadIdx.x == 0 && zc > 0) diff --git a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh similarity index 79% rename from GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh rename to GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh index 3a298986a0..8a92003b84 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh +// GraphBLAS/CUDA/template/GB_cuda_jit_AxB_dot3_phase3_vsvs.cuh //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -25,49 +25,10 @@ // A <- input matrix A // B <- input matrix B -// Blocksize is 1024, uses warp and block reductions to count zombies produced. +// Blocksize is 1024, uses tile and block reductions to count zombies produced. //****************************************************************************** -//------------------------------------------------------------------------------ -// GB_block_ReduceSum_uint64 -//------------------------------------------------------------------------------ - -__inline__ __device__ uint64_t GB_block_ReduceSum_uint64 -( - thread_block g, - uint64_t val -) -{ - // Shared mem for 32 partial sums - static __shared__ uint64_t shared [tile_sz] ; - - // FIXME: assumes tile_sz is 32: (use an #if .. #else ... #endif) - int lane = threadIdx.x & 31 ; // % tile_sz; - int wid = threadIdx.x >> 5 ; // / tile_sz; - thread_block_tile tile = tiled_partition (g) ; - - // Each warp performs partial reduction - val = GB_cuda_warp_sum_uint64 (tile, val) ; - - // Wait for all partial reductions - if (lane == 0) - { - shared [wid] = val ; // Write reduced value to shared memory - } - - g.sync(); // Wait for all partial reductions - - // read from shared memory only if that warp existed - val = (threadIdx.x < (blockDim.x / tile_sz ) ) ? shared[lane] : 0; - - // Final reduce within first warp - if (wid == 0) - { - val = GB_cuda_warp_sum_uint64 (tile, val) ; - } - - return (val) ; -} +#include "template/GB_cuda_threadblock_sum_uint64.cuh" //------------------------------------------------------------------------------ // GB_cuda_AxB_dot3_phase3_vsvs_kernel @@ -205,8 +166,7 @@ __global__ void GB_cuda_AxB_dot3_phase3_vsvs_kernel // FIXME: use this in spdn and vsdn: this_thread_block().sync(); - my_nzombies = GB_block_ReduceSum_uint64 (this_thread_block(), my_nzombies) ; - this_thread_block().sync(); + my_nzombies = GB_cuda_threadblock_sum_uint64 (my_nzombies) ; if( threadIdx.x == 0 && my_nzombies > 0) { diff --git a/GraphBLAS/CUDA/Template/GB_cuda_shfl_down.cuh b/GraphBLAS/CUDA/template/GB_cuda_shfl_down.cuh similarity index 91% rename from GraphBLAS/CUDA/Template/GB_cuda_shfl_down.cuh rename to GraphBLAS/CUDA/template/GB_cuda_shfl_down.cuh index 163298c6af..4a8818f416 100644 --- a/GraphBLAS/CUDA/Template/GB_cuda_shfl_down.cuh +++ b/GraphBLAS/CUDA/template/GB_cuda_shfl_down.cuh @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/Template/GB_cuda_shfl_down.cuh: warp-level reductions +// GraphBLAS/CUDA/template/GB_cuda_shfl_down.cuh: warp-level reductions //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -30,10 +30,10 @@ // dest = (the value of src on thread tid+offset) // } // -// Where tid ranges from 0 to the tile_size-1, which is the warp size of 32 (the -// size of the tile, given by tile.num_threads() and also the #define'd value -// tile_sz), minus one. If tid+offset >= tile_sz for the ith thread, then nothing -// happens for that thread, and the thread is inactive. +// Where tid ranges from 0 to the tile_sz-1, which is the warp size of 32 +// (the size of the tile, given by tile.num_threads() and also the #define'd +// value tile_sz), minus one. If tid+offset >= tile_sz for the ith thread, +// then nothing happens for that thread, and the thread is inactive. // // Restrictions: tile_sz must be a power of 2, and it must be 32 or less for // tile.shfl_down(). The type T must be trivially-copyable (that is @@ -43,13 +43,13 @@ // tile.shfl_down on 32-byte chunks. //------------------------------------------------------------------------------ -// GB_cuda_warp_sum_uint64: reduce a uint64_t value across a single warp +// GB_cuda_tile_sum_uint64: reduce a uint64_t value across a single warp //------------------------------------------------------------------------------ // On input, each thread in the tile holds a single uint64_t value. On output, // thread zero holds the sum of values from all the warps. -__device__ __inline__ uint64_t GB_cuda_warp_sum_uint64 +__device__ __inline__ uint64_t GB_cuda_tile_sum_uint64 ( thread_block_tile tile, uint64_t value @@ -71,6 +71,7 @@ __device__ __inline__ uint64_t GB_cuda_warp_sum_uint64 } #else { + // tile_sz is less than 32 (either 1, 2, 4, 8, or 16) #pragma unroll for (int offset = tile_sz >> 1 ; offset > 0 ; offset >>= 1) { @@ -146,10 +147,10 @@ __device__ __inline__ uint64_t GB_cuda_warp_sum_uint64 #endif //------------------------------------------------------------------------------ -// GB_cuda_warp_reduce_ztype: reduce a ztype to a scalar, on a single warp +// GB_cuda_tile_reduce_ztype: reduce a ztype to a scalar, on a single warp //------------------------------------------------------------------------------ -__device__ __inline__ GB_Z_TYPE GB_cuda_warp_reduce_ztype +__device__ __inline__ GB_Z_TYPE GB_cuda_tile_reduce_ztype ( thread_block_tile tile, GB_Z_TYPE value diff --git a/GraphBLAS/CUDA/template/GB_cuda_threadblock_reduce_ztype.cuh b/GraphBLAS/CUDA/template/GB_cuda_threadblock_reduce_ztype.cuh new file mode 100644 index 0000000000..d6a5900dc6 --- /dev/null +++ b/GraphBLAS/CUDA/template/GB_cuda_threadblock_reduce_ztype.cuh @@ -0,0 +1,65 @@ +//------------------------------------------------------------------------------ +// GraphBLAS/CUDA/template/GB_cuda_threadblock_reduce_ztype.cuh +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. +// This file: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +//------------------------------------------------------------------------------ + +// Reduce across an entire threadblock a single scalar of type ztype, +// using the given monoid (used in GB_cuda_tile_reduce_ztype). + +// Compare with template/GB_cuda_threadblock_sum_uint64. +// The #include'ing file must define tile_sz and log2_tile_sz. + +__inline__ __device__ GB_Z_TYPE GB_cuda_threadblock_reduce_ztype +( + GB_Z_TYPE val +) +{ + // The thread_block g that calls this method has a number of threads + // defined by the kernel launch geometry (dim3 block (blocksz)). + thread_block g = this_thread_block ( ) ; + + // The threads in this thread block are partitioned into tiles, each with + // tile_sz threads. + thread_block_tile tile = tiled_partition (g) ; + + // lane: a local thread id, for all threads in a single tile, ranging from + // 0 to the size of the tile minus one. Normally the tile has size 32, but + // it could be a power of 2 less than or equal to 32. + int lane = threadIdx.x & (tile_sz-1) ; + // tile_id: is the id for a single tile, each with tile_sz threads in it. + int tile_id = threadIdx.x >> log2_tile_sz ; + + // Each tile performs partial reduction + val = GB_cuda_tile_reduce_ztype (tile, val) ; + + // shared result for partial sums of all threads in a tile: + static __shared__ GB_Z_TYPE shared [tile_sz] ; + + if (lane == 0) + { + shared [tile_id] = val ; // Write reduced value to shared memory + } + g.sync() ; // Wait for all partial reductions + + // FIXME: doesn't this assume that the # of threads in the threadblock + // is <= tile_sz squared? For tile_sz = 32, the # of threads in the + // threadblock must be <= 1024. + + // Final reduce within first tile + if (tile_id == 0) + { + GB_DECLARE_IDENTITY_CONST (zid) ; // const GB_Z_TYPE zid = identity ; + // read from shared memory only if that tile existed + val = (threadIdx.x < (blockDim.x >> log2_tile_sz)) ? shared [lane] : zid ; + val = GB_cuda_tile_reduce_ztype (tile, val) ; + } + + g.sync() ; + return (val) ; +} + diff --git a/GraphBLAS/CUDA/template/GB_cuda_threadblock_sum_uint64.cuh b/GraphBLAS/CUDA/template/GB_cuda_threadblock_sum_uint64.cuh new file mode 100644 index 0000000000..c445e8939a --- /dev/null +++ b/GraphBLAS/CUDA/template/GB_cuda_threadblock_sum_uint64.cuh @@ -0,0 +1,59 @@ +//------------------------------------------------------------------------------ +// GraphBLAS/CUDA/template/GB_cuda_threadblock_sum_uint64.cuh +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. +// This file: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +//------------------------------------------------------------------------------ + +// Sum across an entire threadblock a single uint64_t scalar. + +// Compare with template/GB_cuda_threadblock_reduce_ztype. +// The #include'ing file must define tile_sz and log2_tile_sz. + +__inline__ __device__ uint64_t GB_cuda_threadblock_sum_uint64 +( + uint64_t val +) +{ + // The thread_block g that calls this method has a number of threads + // defined by the kernel launch geometry (dim3 block (blocksz)). + thread_block g = this_thread_block ( ) ; + + // The threads in this thread block are partitioned into tiles, each with + // tile_sz threads. + thread_block_tile tile = tiled_partition (g) ; + + // lane: a local thread id, for all threads in a single tile, ranging from + // 0 to the size of the tile minus one. Normally the tile has size 32, but + // it could be a power of 2 less than or equal to 32. + int lane = threadIdx.x & (tile_sz-1) ; + // tile_id: is the id for a single tile, each with tile_sz threads in it. + int tile_id = threadIdx.x >> log2_tile_sz ; + + // Each tile performs partial reduction + val = GB_cuda_tile_sum_uint64 (tile, val) ; + + // shared result for partial sums of all threads in a tile: + static __shared__ uint64_t shared [tile_sz] ; + + if (lane == 0) + { + shared [tile_id] = val ; // Write reduced value to shared memory + } + g.sync() ; // Wait for all partial reductions + + // Final reduce within first tile + if (tile_id == 0) + { + // read from shared memory only if that tile existed + val = (threadIdx.x < (blockDim.x >> log2_tile_sz)) ? shared [lane] : 0 ; + val = GB_cuda_tile_sum_uint64 (tile, val) ; + } + + g.sync() ; + return (val) ; +} + diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_AxB_dot3.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_AxB_dot3.cu similarity index 99% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_AxB_dot3.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_AxB_dot3.cu index b97454b112..54a3de5e24 100644 --- a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_AxB_dot3.cu +++ b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_AxB_dot3.cu @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_AxB_dot3.cu +// GraphBLAS/CUDA/jit_kernels/GB_jit_kernel_cuda_AxB_dot3.cu //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -32,6 +32,7 @@ #define chunk_size 128 #define log2_chunk_size 7 #define tile_sz 32 +#define log2_tile_sz 5 #define shared_vector_size 128 #define blocksize 32 #define threads_per_block 32 diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_apply_bind1st.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_apply_bind1st.cu similarity index 100% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_apply_bind1st.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_apply_bind1st.cu diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_apply_bind2nd.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_apply_bind2nd.cu similarity index 100% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_apply_bind2nd.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_apply_bind2nd.cu diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_apply_unop.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_apply_unop.cu similarity index 100% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_apply_unop.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_apply_unop.cu diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_colscale.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_colscale.cu similarity index 100% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_colscale.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_colscale.cu diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_reduce.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_reduce.cu similarity index 82% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_reduce.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_reduce.cu index a2bcf5ba6a..c45ce5dafb 100644 --- a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_reduce.cu +++ b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_reduce.cu @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GraphBLAS/CUDA/JitKernels/GB_jit_cuda_reduce.cu +// GraphBLAS/CUDA/jit_kernels/GB_jit_cuda_reduce.cu //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. @@ -28,45 +28,13 @@ #error "kernel undefined for C or A iso" #endif -// FIXME: put these definitions in GB_cuda_kernel.h: +// tile_sz can vary per algorithm. It must a power of 2, and because we +// use tile.shfl_down(), it must also be <= 32. #define tile_sz 32 #define log2_tile_sz 5 #include "GB_cuda_shfl_down.cuh" - -//------------------------------------------------------------------------------ -// GB_block_Reduce: reduce across all warps into a single scalar -//------------------------------------------------------------------------------ - -__inline__ __device__ GB_Z_TYPE GB_block_Reduce -( - thread_block g, - GB_Z_TYPE val -) -{ - static __shared__ GB_Z_TYPE shared [tile_sz] ; - int lane = threadIdx.x & (tile_sz-1) ; - int wid = threadIdx.x >> log2_tile_sz ; - thread_block_tile tile = tiled_partition( g ) ; - - // Each warp performs partial reduction - val = GB_cuda_warp_reduce_ztype (tile, val) ; - - // Wait for all partial reductions - if (lane == 0) - { - shared [wid] = val ; // Write reduced value to shared memory - } - this_thread_block().sync() ; // Wait for all partial reductions - - GB_DECLARE_IDENTITY_CONST (zid) ; // const GB_Z_TYPE zid = identity ; - - val = (threadIdx.x < (blockDim.x >> LOG2_WARPSIZE)) ? shared [lane] : zid ; - - // Final reduce within first warp - val = GB_cuda_warp_reduce_ztype (tile, val) ; - return (val) ; -} +#include "GB_cuda_threadblock_reduce_ztype.cuh" //------------------------------------------------------------------------------ // GB_cuda_reduce_kernel: reduce all entries in a matrix to a single scalar @@ -172,8 +140,7 @@ __global__ void GB_cuda_reduce_kernel // phase 2: each threadblock reduces all threads into a scalar //-------------------------------------------------------------------------- - zmine = GB_block_Reduce( this_thread_block(), zmine) ; - this_thread_block().sync() ; + zmine = GB_cuda_threadblock_reduce_ztype (zmine) ; //-------------------------------------------------------------------------- // phase 3: reduce across threadblocks @@ -217,8 +184,8 @@ extern "C" GB_JIT_CUDA_KERNEL_REDUCE_PROTO (GB_jit_kernel) { - dim3 grid (gridsz) ; - dim3 block (blocksz) ; + dim3 grid (gridsz) ; // gridsz: # of threadblocks + dim3 block (blocksz) ; // blocksz: # of threads in each threadblock GB_A_NHELD (anz) ; // anz = # of entries held in A GB_cuda_reduce_kernel <<>> (zscalar, V, A, anz) ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_rowscale.cu b/GraphBLAS/CUDA/template/GB_jit_kernel_cuda_rowscale.cu similarity index 100% rename from GraphBLAS/CUDA/JitKernels/GB_jit_kernel_cuda_rowscale.cu rename to GraphBLAS/CUDA/template/GB_jit_kernel_cuda_rowscale.cu diff --git a/GraphBLAS/Config/GB_prejit.c b/GraphBLAS/Config/GB_prejit.c index d2ed98f28e..fb96f15970 100644 --- a/GraphBLAS/Config/GB_prejit.c +++ b/GraphBLAS/Config/GB_prejit.c @@ -11,8 +11,8 @@ // indexed the following 0 kernels in GraphBLAS/PreJIT: #include "GB.h" -#include "GB_jit_kernel_proto.h" -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" +#include "jit_kernels/include/GB_jit_kernel_proto.h" //------------------------------------------------------------------------------ // prototypes for all PreJIT kernels diff --git a/GraphBLAS/Config/GB_prejit.c.in b/GraphBLAS/Config/GB_prejit.c.in index 0955d97234..b186005008 100644 --- a/GraphBLAS/Config/GB_prejit.c.in +++ b/GraphBLAS/Config/GB_prejit.c.in @@ -11,8 +11,8 @@ // indexed the following @GB_PREJIT_LEN@ kernels in GraphBLAS/PreJIT: #include "GB.h" -#include "GB_jit_kernel_proto.h" -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" +#include "jit_kernels/include/GB_jit_kernel_proto.h" //------------------------------------------------------------------------------ // prototypes for all PreJIT kernels diff --git a/GraphBLAS/Config/GraphBLAS.h.in b/GraphBLAS/Config/GraphBLAS.h.in index 864a4f5841..1b35318903 100644 --- a/GraphBLAS/Config/GraphBLAS.h.in +++ b/GraphBLAS/Config/GraphBLAS.h.in @@ -7116,7 +7116,7 @@ GrB_Info GrB_Vector_apply_BinaryOp1st_Scalar // w = accum (w, op(x,u)) const GrB_Descriptor desc // descriptor for w and mask ) ; -// historical: identical to GxB_Vector_apply_BinaryOp1st +// historical: identical to GrB_Vector_apply_BinaryOp1st_Scalar GrB_Info GxB_Vector_apply_BinaryOp1st // w = accum (w, op(x,u)) ( GrB_Vector w, // input/output vector for results diff --git a/GraphBLAS/Demo/Program/gauss_demo.c b/GraphBLAS/Demo/Program/gauss_demo.c index b32ec76b06..a4bfff6e81 100644 --- a/GraphBLAS/Demo/Program/gauss_demo.c +++ b/GraphBLAS/Demo/Program/gauss_demo.c @@ -259,7 +259,7 @@ int main (void) // require a new JIT kernel to be compiled: if this is the first run of // this demo, the cache folder is empty. Otherwise, the good gauss type // will be left in the cache folder from a prior run of this program, and - // its type defintion does not match this one. The burble will say "jit: + // its type definition does not match this one. The burble will say "jit: // loaded but must recompile" in this case. GrB_Type BadGauss = NULL ; info = GxB_Type_new (&BadGauss, 0, "gauss", BAD_GAUSS_DEFN) ; diff --git a/GraphBLAS/Doc/ChangeLog b/GraphBLAS/Doc/ChangeLog index cb71863924..2e556bd7fa 100644 --- a/GraphBLAS/Doc/ChangeLog +++ b/GraphBLAS/Doc/ChangeLog @@ -1,3 +1,8 @@ +June 1, 2024: version 9.3.0 + + * code restructuring: Source folder split into many subfolders, and + some files and internal functions renamed. No visible external change. + May 22, 2024: version 9.2.0 * Added graphblas_install.m: for a simpler method of compiling diff --git a/GraphBLAS/Doc/FUTURE.txt b/GraphBLAS/Doc/FUTURE.txt index 79dd37efa8..90712b3a2b 100644 --- a/GraphBLAS/Doc/FUTURE.txt +++ b/GraphBLAS/Doc/FUTURE.txt @@ -1,22 +1,22 @@ -FUTURE plans For 9.0.1: and beyond: +FUTURE plans for GraphBLAS: -GraphBLAS: + GrB_IndexBinaryOp : very important for many graph algorithms - don't just check 1st line of GraphBLAS.h when deciding to unpack - the src in user cache folder. Use a crc test. - -CUDA: - - finding src - kernel source location, and name - -Future features: + JIT package: don't just check 1st line of GraphBLAS.h when deciding to + unpack the src in user cache folder. Use a crc test. cumulative sum (or other monoid) + Raye: link-time optimization with binary for operators, for Julia + pack/unpack COO + kernel fusion + CUDA kernels + CUDA: finding src + CUDA: kernel source location, and name + distributed framework fine-grain parallelism for dot-product based mxm, mxv, vxm, @@ -24,7 +24,7 @@ Future features: (or call them GxB_outerProduct and GxB_innerProduct?) aggregators - index binary ops + GrB_extract with GrB_Vectors instead of (GrB_Index *) arrays for I and J iso: set a flag with GrB_get/set to disable iso. useful if the matrix is @@ -55,10 +55,10 @@ Future features: * check if vectorization of GrB_mxm is effective when using clang * see how HNSW vector search could be implemented in GraphBLAS -CUDA JIT: + for CUDA JIT: - https://developer.nvidia.com/blog/cuda-12-0-compiler-support-for-runtime-lto-using-nvjitlink-library/ - Developer webpage talking about ways to do nvJit with link time - optimization using CUDA 12.0 Shows precompiled path and JIT path to - generate kernels + https://developer.nvidia.com/blog/cuda-12-0-compiler-support-for-runtime-lto-using-nvjitlink-library/ + Developer webpage talking about ways to do nvJit with link time + optimization using CUDA 12.0 Shows precompiled path and JIT path to + generate kernels diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf index d7362c512b..025a8890d0 100644 Binary files a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf and b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf differ diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex index d9cfd5675f..d2842dac87 100644 --- a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex +++ b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex @@ -8117,8 +8117,7 @@ \section{The SuiteSparse:GraphBLAS JIT} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% kernels that used function pointers for each operator and for any typecasting required. Even built-in types and operators were sometimes handled by the generic kernels, if any typecasting was done, or if the specific operator, -monoid, or semiring was disabled by the \verb'Source/GB_control.h' file when -GraphBLAS was compiled. +monoid, or semiring was disabled when GraphBLAS was compiled. \subsection{Using the JIT} @@ -14484,6 +14483,13 @@ \section{Release Notes} \begin{itemize} +\item June 1, 2024: version 9.3.0 + + \begin{itemize} + \item code restructuring: Source folder split into many subfolders, and + some files and internal functions renamed. No visible external change. + \end{itemize} + \item May 22, 2024: version 9.2.0 \begin{itemize} diff --git a/GraphBLAS/Doc/GraphBLAS_version.tex b/GraphBLAS/Doc/GraphBLAS_version.tex index bf7fadb692..ee256fd2cf 100644 --- a/GraphBLAS/Doc/GraphBLAS_version.tex +++ b/GraphBLAS/Doc/GraphBLAS_version.tex @@ -1,5 +1,5 @@ % version of SuiteSparse:GraphBLAS \date{VERSION -9.2.0, -May 22, 2024} +9.3.0, +June 1, 2024} diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_fc32.c index 4c5d54e042..995e8f392e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_div (a,b) ; z = x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_div_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_div_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_fc64.c index fe05f0d77b..013112b756 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_div (a,b) ; z = x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_div_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_div_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_fp32.c index dd0d16eb34..55d59244c2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a/b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_div_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_div_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_fp64.c index 7538baf8fd..11b7e9d722 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a/b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_div_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_div_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_int16.c index 691e76fe66..b9c289ee9a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_div_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_div_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_int32.c index e22807f116..de8a3f1ef7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_div_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_div_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_int64.c index b6255b935f..6c245fbf31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (a,b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_div_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_div_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_int8.c index 67ef578d28..417b5fee80 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_div_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_div_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_uint16.c index 8d47cdef15..a030d058a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_div_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_div_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_uint32.c index 356fa3f02e..9da1a97cec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_div_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_div_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_uint64.c index b712d9c6e3..f9b4b4c2fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (a,b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_div_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_div_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_div_uint8.c index d4fb4bf2a8..90d74f35e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_div_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_div_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_div_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_div_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_div_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_bool.c index e703010e98..3c09083d51 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_fp32.c index cbb2e24ea3..17a88f44f4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_fp32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_fp64.c index 5eac2738df..f2f71a7e61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_fp64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_int16.c index 01c00fdbc6..f19b1cf491 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_int32.c index 9e9d3e2f22..05774c4212 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_int64.c index e39136e195..896c48c74f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_int64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_int8.c index 05fb5058a5..acd06b9f40 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint16.c index 73567ea646..4c360dd2dc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint32.c index e1ef4037fe..cbf107db02 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint64.c index 6a6873691e..de1ef0436b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_uint64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint8.c index ca6c8bae79..10baa80774 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_eq_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_eq_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a == b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_eq_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_eq_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_eq_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_bool.c index 883b439686..64939c2795 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_bool) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_fc32.c index d85a53392f..7134402c99 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__any_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__any_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -121,7 +123,7 @@ GrB_Info GB (_Adot3B__any_first_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_fc32) ( @@ -150,7 +152,7 @@ GrB_Info GB (_AsaxbitB__any_first_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -233,8 +235,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -242,8 +244,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -283,8 +285,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -292,8 +294,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_fc64.c index 4fffec5b9e..d7aeccac28 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_first_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_fc64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_first_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_fp32.c index 6c57b96e29..412a54074a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__any_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__any_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -119,7 +121,7 @@ GrB_Info GB (_Adot3B__any_first_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_fp32) ( @@ -148,7 +150,7 @@ GrB_Info GB (_AsaxbitB__any_first_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -231,8 +233,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -240,8 +242,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -281,8 +283,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -290,8 +292,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_fp64.c index b0e92a5f1b..12a8ab7ad0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__any_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__any_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -119,7 +121,7 @@ GrB_Info GB (_Adot3B__any_first_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_fp64) ( @@ -148,7 +150,7 @@ GrB_Info GB (_AsaxbitB__any_first_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -231,8 +233,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -240,8 +242,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -281,8 +283,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -290,8 +292,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__any_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_int16.c index 853bbb0455..c00f49fa02 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_int16) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_int32.c index 2e712868f6..94994d0fb5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_int32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_int64.c index 150c0d45ef..a4fa50d4e7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__any_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__any_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -119,7 +121,7 @@ GrB_Info GB (_Adot3B__any_first_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_int64) ( @@ -148,7 +150,7 @@ GrB_Info GB (_AsaxbitB__any_first_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -231,8 +233,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -240,8 +242,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -281,8 +283,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -290,8 +292,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_int8.c index 74241d579d..a74736e1a7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_int8) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_uint16.c index cd54aded6e..4eacf468c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_uint16) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_uint32.c index 9e2c8f26c7..9a222dc506 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_uint32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_uint64.c index 2d09c01ec0..c4ed7f7138 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__any_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__any_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -119,7 +121,7 @@ GrB_Info GB (_Adot3B__any_first_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_uint64) ( @@ -148,7 +150,7 @@ GrB_Info GB (_AsaxbitB__any_first_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -231,8 +233,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -240,8 +242,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -281,8 +283,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -290,8 +292,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_first_uint8.c index 651c5ba400..08fe6ec854 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_first_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_first_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = a @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_first_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_first_uint8) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_first_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti1_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firsti1_int32.c index 7fa06a72e6..03c9792f8f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_firsti1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (i+1) @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__any_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__any_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -121,7 +123,7 @@ GrB_Info GB (_Adot3B__any_firsti1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firsti1_int32) ( @@ -150,7 +152,7 @@ GrB_Info GB (_AsaxbitB__any_firsti1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -233,8 +235,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -242,8 +244,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -283,8 +285,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -292,8 +294,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti1_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firsti1_int64.c index d762b5c803..31e5ad7dfd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_firsti1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (i+1) @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__any_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__any_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -122,7 +124,7 @@ GrB_Info GB (_Adot3B__any_firsti1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firsti1_int64) ( @@ -151,7 +153,7 @@ GrB_Info GB (_AsaxbitB__any_firsti1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -234,8 +236,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -243,8 +245,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -284,8 +286,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -293,8 +295,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firsti_int32.c index 3300e2a91d..29269523e2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_firsti_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = i @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_firsti_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firsti_int32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_firsti_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firsti_int64.c index 844aa9e45d..af5c6d8adb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firsti_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firsti_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_firsti_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = i @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__any_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__any_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -121,7 +123,7 @@ GrB_Info GB (_Adot3B__any_firsti_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firsti_int64) ( @@ -150,7 +152,7 @@ GrB_Info GB (_AsaxbitB__any_firsti_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -233,8 +235,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -242,8 +244,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -283,8 +285,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -292,8 +294,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__any_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj1_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firstj1_int32.c index 3e11ba53c2..1cc2dc3643 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_firstj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (k+1) @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__any_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__any_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -122,7 +124,7 @@ GrB_Info GB (_Adot3B__any_firstj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firstj1_int32) ( @@ -151,7 +153,7 @@ GrB_Info GB (_AsaxbitB__any_firstj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -234,8 +236,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -243,8 +245,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -284,8 +286,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -293,8 +295,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj1_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firstj1_int64.c index f886368840..4d9fca5347 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_firstj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (k+1) @@ -70,7 +72,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -91,7 +93,7 @@ GrB_Info GB (_Adot2B__any_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_Adot3B__any_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -123,7 +125,7 @@ GrB_Info GB (_Adot3B__any_firstj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firstj1_int64) ( @@ -152,7 +154,7 @@ GrB_Info GB (_AsaxbitB__any_firstj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -235,8 +237,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -244,8 +246,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -285,8 +287,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -294,8 +296,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firstj_int32.c index 578a065514..964bdf2b97 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_firstj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = k @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_firstj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firstj_int32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_firstj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_firstj_int64.c index ca9ff09044..787d0fbec9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_firstj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_firstj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_firstj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = k @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__any_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__any_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -121,7 +123,7 @@ GrB_Info GB (_Adot3B__any_firstj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_firstj_int64) ( @@ -150,7 +152,7 @@ GrB_Info GB (_AsaxbitB__any_firstj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -233,8 +235,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -242,8 +244,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -283,8 +285,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -292,8 +294,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__any_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_bool.c index 3306c0291e..02d940b4a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_fp32.c index b48fe11bde..073efd23c2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_fp32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_fp64.c index 1de9394e1b..23e4aad9eb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_fp64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_int16.c index e32d16a055..4688468bd1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_int32.c index 934ecac008..2cdd62e476 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_int64.c index 5cc88228d8..012c073115 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_int64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_int8.c index c1a460d4f9..176564f172 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint16.c index af49e5e016..30af637953 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint32.c index a6b77f2c04..76df8ef9ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint64.c index 87ce6c56cd..11c98801d8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_uint64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint8.c index e09ed6bd02..497f5abace 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ge_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_ge_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a >= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ge_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ge_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ge_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_bool.c index 511868f346..2433f94b92 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_fp32.c index 594ef378f6..8d2d057a63 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_fp32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_fp64.c index 5b89fe8575..dabb4d93d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_fp64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_int16.c index ddfaf72cae..ccb46fdde1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_int32.c index 8304d59199..83969e7590 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_int64.c index 41020f4ced..7b161d510b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_int64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_int8.c index d402689456..9aa478a29c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint16.c index fcfbe65721..ff7cc5f1e6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint32.c index 6e4270ac84..ad6a03d443 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint64.c index 56ddcec68b..a733f4a067 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_uint64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint8.c index 29cc256179..48dcf9dfd4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_gt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_gt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a > b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_gt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_gt_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_gt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_land_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_land_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_land_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_land_bool.c index ef1cc5ab3f..22d750df19 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_land_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_land_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a && b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_land_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_land_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_land_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_land_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_bool.c index be28865c2d..f9403b0561 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_fp32.c index dfe98fe03f..9485df4a5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_fp32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_fp64.c index d3c6bbd224..941775ae9c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_fp64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_int16.c index e8af8a7674..add0356aec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_int32.c index ea9a6673ed..33a8f6d5d8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_int64.c index f51becb84f..d251159ee6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_int64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_int8.c index 1f90ac47c7..49a2e4eba3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_uint16.c index fcf7444578..d81affd9c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_uint32.c index 968bd17ac9..3dff114bd8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_uint64.c index 621a824748..c28ab22600 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_uint64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_le_uint8.c index 6c0c1dd2b8..20fecda9a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_le_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_le_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a <= b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_le_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_le_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_le_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lor_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lor_bool.c index 877eea227b..0e8e1bcf42 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_lor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a || b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lor_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_bool.c index 6d406020cc..b20dbbfd9b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_fp32.c index 5df96fea40..01226db186 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_fp32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_fp64.c index 9e12ae5c37..d7c77ce270 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_fp64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_int16.c index b42979b576..03a1bb227a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_int32.c index a9a1e4b0d7..e8a5c2008c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_int64.c index a03c542ca4..3453569df4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_int64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_int8.c index a4dd9adce2..93ee83b24b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint16.c index 4cc04266d6..59f52de40b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint32.c index 2286cba4d8..365f48d7e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint64.c index 7655523a65..f3248fe6e8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_uint64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint8.c index bc491d814e..a962f0bd47 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_lt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a < b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lt_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lxor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_lxor_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_lxor_bool.c index 57c64ff4a1..f31a4cb6fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_lxor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_lxor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_lxor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_lxor_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_lxor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_lxor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_fp32.c index 7e2ce1fbbf..e03c2466ea 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (a,b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_max_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_max_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_fp64.c index 61544b0387..99c812d5af 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (a,b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_max_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_max_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_int16.c index c9c0dc7b21..cfcac8b928 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_max_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_max_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_int32.c index 1d347c248c..4e47cd3ebe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_max_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_max_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_int64.c index 0e68e9fdda..bc202c07dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_max_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_max_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_int8.c index da5680ec13..9451540946 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_max_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_max_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_uint16.c index b635399bc6..c578ab2f96 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_max_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_max_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_uint32.c index b908c057a6..c2bf4c08d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_max_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_max_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_uint64.c index cf7c0d8575..9c61444515 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_max_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_max_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_max_uint8.c index 1cfae72d05..d10d368564 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_max_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_max_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMAX (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_max_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_max_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_max_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_fp32.c index e7edf15c01..3b89d45f61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (a,b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_min_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_min_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_fp64.c index c7de6daf71..004cb173db 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (a,b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_min_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_min_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_int16.c index 1c2eefddd9..5d3efef04d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_min_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_min_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_int32.c index e4a51a4193..fff982cead 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_min_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_min_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_int64.c index 98fed4581e..22864e0e99 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_min_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_min_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_int8.c index 4173646d5c..fbdb081dbe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_min_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_min_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_uint16.c index fd8a0160aa..7df9231e50 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_min_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_min_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_uint32.c index 80254a20c7..560a2a5c8d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_min_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_min_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_uint64.c index 11de0126ec..9d00b51086 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_min_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_min_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_min_uint8.c index 09fc0caea7..9c302331bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_min_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_min_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMIN (a,b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_min_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_min_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_min_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_fc32.c index 3976d3fcfd..ab4b8142a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_minus (a,b) ; z = x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_minus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_minus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_fc64.c index 85862ffc6b..1136643192 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_minus (a,b) ; z = x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_minus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_minus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_fp32.c index d74ce2047e..67ca970518 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a-b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_minus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_minus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_fp64.c index b07d9b282a..32373c0e62 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a-b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_minus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_minus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_int16.c index da6ab46f44..e01de14ee2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a-b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_minus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_minus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_int32.c index 25dbad3483..4ddd93ae0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a-b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_minus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_minus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_int64.c index 91968dd843..229168d38a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a-b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_minus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_minus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_int8.c index 90d49200d5..7d8b64a7c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a-b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_minus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_minus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint16.c index a12e8ce514..694aeeac9a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a-b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_minus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_minus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint32.c index dc9f672396..53e365ec53 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a-b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_minus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_minus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint64.c index af7df6f9ff..ead2e7f67e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a-b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_minus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_minus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint8.c index 14bad44f30..07be6097bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_minus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_minus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a-b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_minus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_minus_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_minus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_fp32.c index 3686bf5477..c86471ace8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_fp32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_fp64.c index ae1185bd0e..c86e00a893 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_fp64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_int16.c index 14faad2e0f..845ed11603 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_int32.c index 5e0393242d..248d5ab140 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_int64.c index 0834759079..3f94094a04 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_int64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_int8.c index 3f5c595001..ac114a71a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint16.c index 6076daba06..0ec00c96ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint32.c index 5a77e7a346..90989196a3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint64.c index ee83015a59..a90acfc23b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_uint64) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint8.c index 44b311fba4..601f4bcf38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_ne_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_ne_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a != b) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_ne_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_ne_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_ne_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_fc32.c index 3da5a280fc..a763dd6a14 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_add (a,b) ; z = x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_plus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_plus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_fc64.c index 725938ac5f..ad3a6cad38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_add (a,b) ; z = x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_plus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_plus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_fp32.c index bef6a19f43..5b1a05a4f9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a+b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_plus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_plus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_fp64.c index 56a5be4300..f6db4f7110 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a+b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_plus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_plus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_int16.c index 672672834f..74c737c325 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a+b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_plus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_plus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_int32.c index b466d9df9a..1b692cfc13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a+b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_plus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_plus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_int64.c index da43d407d7..eae29663ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a+b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_plus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_plus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_int8.c index 0dd395bc21..4a86a150e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a+b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_plus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_plus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint16.c index 13a0100d2b..5f5f881e78 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a+b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_plus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_plus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint32.c index 4bf6634011..31883d8283 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a+b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_plus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_plus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint64.c index 3fa192e1ff..b917c1f4f9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a+b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_plus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_plus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint8.c index 2cb0c43265..feebe070e5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_plus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_plus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a+b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_plus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_plus_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_plus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fc32.c index a803f7785c..8c0de4699a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_div (b,a) ; z = x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fc64.c index e8a7e3df21..fe98a57f30 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_div (b,a) ; z = x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fp32.c index 99d3be5b9e..183acf4afc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (b/a) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fp64.c index acdd3af506..c29cc1f371 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (b/a) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rdiv_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int16.c index b75231983b..660e207f92 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (b, a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int32.c index 80cdf6b19a..d68a5dd50a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (b, a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int64.c index f890352843..cfa2819d4c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (b, a) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int8.c index 592066828a..9d177fab74 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (b, a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rdiv_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint16.c index 43f38121f3..e52b509976 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (b, a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint32.c index 8a8e21be51..77f29f999b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (b, a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint64.c index 854efab12e..42e207a45d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (b, a) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint8.c index 5241317466..94b6416b31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rdiv_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_rdiv_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (b, a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rdiv_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rdiv_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rdiv_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fc32.c index d6ecfe2e37..aa717c729e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_minus (b,a) ; z = x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_rminus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fc64.c index 2665515623..6be133a331 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_minus (b,a) ; z = x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_rminus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fp32.c index 62036195fa..28813d5ad8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (b-a) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rminus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fp64.c index 116170d8b1..32be47f68d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (b-a) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rminus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int16.c index 5892b140ab..43bbe0cc8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (b-a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rminus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int32.c index 798d61e0ea..d01ef95b3a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (b-a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rminus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int64.c index 112c6081db..1a20ce06d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (b-a) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rminus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int8.c index b2d303ff7d..b1537e661b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (b-a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rminus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint16.c index 4133ca49a9..e55526b434 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (b-a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint32.c index 854b7ced57..75bd2d3b63 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (b-a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint64.c index beab0d5392..efcb9fb383 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (b-a) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint8.c index dc95d7b112..0833785417 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_rminus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_rminus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (b-a) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_rminus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_rminus_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_rminus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_bool.c index d8958462df..a7b43df624 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_bool.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_bool) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_fc32.c index aaf6fdc762..5b8f8a470f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_second_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_second_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_fc64.c index 0482cbfa4c..dbd5430d69 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_second_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_second_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_fp32.c index 8bfd5b63d0..6e48f00e51 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_second_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_second_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_fp64.c index b9db7144e2..6e1ea36f7e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_second_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_second_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_int16.c index f903a89f13..2f34b08ef2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_int32.c index 97afbef0ed..500efc9948 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_int64.c index c96347d934..22e2deaba8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_second_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_second_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_int8.c index a50b1cef50..11615ca6d8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_uint16.c index 6dab26ec6d..ebf72e9ed9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_uint32.c index 5fdee71857..0feeb2d94e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_uint64.c index df74705559..76dc23780e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_second_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_second_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_second_uint8.c index 3468ba4107..92143d1253 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_second_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_second_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = b @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_second_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_second_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_second_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj1_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_secondj1_int32.c index d9a24c77a0..c7d683db86 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_secondj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (j+1) @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__any_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__any_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -122,7 +124,7 @@ GrB_Info GB (_Adot3B__any_secondj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_secondj1_int32) ( @@ -151,7 +153,7 @@ GrB_Info GB (_AsaxbitB__any_secondj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -234,8 +236,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -243,8 +245,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -284,8 +286,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -293,8 +295,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj1_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_secondj1_int64.c index 4995d2fa96..2b3de283d1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_secondj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (j+1) @@ -70,7 +72,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -91,7 +93,7 @@ GrB_Info GB (_Adot2B__any_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_Adot3B__any_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -123,7 +125,7 @@ GrB_Info GB (_Adot3B__any_secondj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_secondj1_int64) ( @@ -152,7 +154,7 @@ GrB_Info GB (_AsaxbitB__any_secondj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -235,8 +237,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -244,8 +246,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -285,8 +287,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -294,8 +296,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_secondj_int32.c index d7caa36c13..eba1d4ca31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_secondj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = j @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_secondj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_secondj_int32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_secondj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_secondj_int64.c index 1791401088..8d9dcead7c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_secondj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_secondj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_secondj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = j @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__any_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__any_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -121,7 +123,7 @@ GrB_Info GB (_Adot3B__any_secondj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_secondj_int64) ( @@ -150,7 +152,7 @@ GrB_Info GB (_AsaxbitB__any_secondj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -233,8 +235,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -242,8 +244,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -283,8 +285,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -292,8 +294,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__any_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_fc32.c index 16507a89eb..13ba411512 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_mul (a,b) ; z = x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__any_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__any_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -120,7 +122,7 @@ GrB_Info GB (_Adot3B__any_times_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_fc32) ( @@ -149,7 +151,7 @@ GrB_Info GB (_AsaxbitB__any_times_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,8 +234,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -241,8 +243,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -282,8 +284,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -291,8 +293,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_fc64.c index c5b13c7acb..be4aad98f9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_mul (a,b) ; z = x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__any_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__any_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -116,7 +118,7 @@ GrB_Info GB (_Adot3B__any_times_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_fc64) ( @@ -145,7 +147,7 @@ GrB_Info GB (_AsaxbitB__any_times_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -228,8 +230,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -237,8 +239,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -278,8 +280,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -287,8 +289,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_fp32.c index b461679394..2813875a87 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a*b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_times_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_fp32) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_times_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_fp64.c index 683b188865..89d1d62eeb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (a*b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_times_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_fp64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_times_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_int16.c index 0417943508..959384d8d1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int16.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a*b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_times_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_int16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_times_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_int32.c index eff251a9df..498e8af6fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int32.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a*b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_times_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_int32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_times_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_int64.c index 9c93c55250..f8507249ba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int64.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a*b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_times_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_int64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_times_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_int8.c index 96b4e982f7..c8c53fe6d5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_int8.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a*b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_times_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_int8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_times_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_uint16.c index 28331f6ba7..dbadfebfc1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a*b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_times_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_uint16) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_times_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_uint32.c index 6fb66b932d..fb30ed3d02 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a*b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_times_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_uint32) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_times_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_uint64.c index 7205ecf93a..d46b74eb1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a*b) ; z = x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__any_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__any_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_Adot3B__any_times_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_uint64) ( @@ -147,7 +149,7 @@ GrB_Info GB (_AsaxbitB__any_times_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -230,8 +232,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -239,8 +241,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -280,8 +282,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -289,8 +291,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__any_times_uint8.c index 0e2d86e94c..5a9dadd9f2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__any_times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__any_times_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__any_times_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a*b) ; z = x_op_y ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_times_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_times_uint8) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_times_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_band_uint16.c index 503e8483f8..158fc0818c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__band_band_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a & b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_band_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_band_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_band_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_band_uint32.c index f73daceba4..e0f789f5a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__band_band_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a & b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_band_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_band_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_band_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_band_uint64.c index d7ed548819..c43837338c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__band_band_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a & b) ; z &= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__band_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__band_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__band_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__band_band_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_band_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__band_band_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_band_uint8.c index 83774c02d5..e11ba0e744 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_band_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_band_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__band_band_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a & b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_band_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_band_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_band_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint16.c index e66ba386e5..7148b9cf94 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__band_bor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a | b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bor_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint32.c index 8196cee620..a9a9058866 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__band_bor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a | b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bor_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint64.c index d3e4479d58..bcacd23c25 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__band_bor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a | b) ; z &= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__band_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__band_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__band_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__band_bor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bor_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__band_bor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint8.c index 3643284e59..904531f3fe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__band_bor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a | b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bor_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint16.c index ad5214545c..4f6816f885 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxnor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ~(a ^ b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxnor_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bxnor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint32.c index 70ffc55838..0c5a3eebf4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxnor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ~(a ^ b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxnor_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bxnor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint64.c index d678afb113..704726827a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxnor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ~(a ^ b) ; z &= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__band_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__band_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxnor_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__band_bxnor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint8.c index 886c949e51..cd44b08d3b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxnor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxnor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxnor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ~(a ^ b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bxnor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxnor_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bxnor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint16.c index 20e11a3ab1..cb75479c55 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a ^ b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxor_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bxor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint32.c index 0a5a5993a5..773dbba254 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a ^ b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxor_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bxor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint64.c index 4aaf8dfd26..8cb272bb80 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a ^ b) ; z &= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__band_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__band_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxor_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__band_bxor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint8.c index 9e0525d384..950fa83216 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__band_bxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__band_bxor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__band_bxor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a ^ b) ; z &= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__band_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__band_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__band_bxor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__band_bxor_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__band_bxor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__band_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__band_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint16.c index 86fe32671d..47ab592e06 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bor_band_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a & b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_band_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_band_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_band_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint32.c index e9d484fac9..7eddbdf853 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bor_band_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a & b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_band_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_band_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_band_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint64.c index ffb13fbe0e..7270f42129 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bor_band_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a & b) ; z |= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__bor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__bor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__bor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__bor_band_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_band_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__bor_band_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint8.c index c99d1df3f9..44452e2030 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_band_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_band_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bor_band_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a & b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_band_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_band_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_band_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint16.c index 8c1c5a126e..c3da2f4140 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a | b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bor_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint32.c index 4dc0b3e8e7..95a7ff1864 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a | b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bor_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint64.c index 0cf3145611..6015fb8903 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a | b) ; z |= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__bor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__bor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bor_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__bor_bor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint8.c index 32452e1418..6cfda86b9f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a | b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bor_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint16.c index 52c8d73a47..a630eada27 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxnor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ~(a ^ b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxnor_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bxnor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint32.c index a2f89a613c..76c0ee75c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxnor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ~(a ^ b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxnor_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bxnor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint64.c index 55da58f1fb..4fc6399f9e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxnor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ~(a ^ b) ; z |= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__bor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__bor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxnor_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__bor_bxnor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint8.c index 661bbb4c49..ff38cd920e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxnor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxnor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxnor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ~(a ^ b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bxnor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxnor_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bxnor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint16.c index 48257c74c1..965e014c23 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a ^ b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxor_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bxor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint32.c index 344c0d972c..eaa5ce21ea 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a ^ b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxor_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bxor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint64.c index 63038e6d8f..8946c6808c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a ^ b) ; z |= x_op_y ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__bor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__bor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxor_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__bor_bxor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint8.c index f8912e2a84..7f3191edcf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bor_bxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bor_bxor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bor_bxor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a ^ b) ; z |= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__bor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__bor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__bor_bxor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bor_bxor_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__bor_bxor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__bor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__bor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint16.c index 4e7ed70ab4..2265b2a8ce 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_band_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a & b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_band_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_band_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint32.c index cea9a7da77..678e1ca565 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_band_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a & b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_band_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_band_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint64.c index c9a287d24f..fc248a01ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_band_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a & b) ; z = ~(z ^ x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__bxnor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__bxnor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_band_uint64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__bxnor_band_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint8.c index 76f0f6730f..2df638129c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_band_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_band_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_band_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a & b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_band_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_band_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_band_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint16.c index a62d613a9a..f735db5e66 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a | b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bor_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint32.c index 54f4f78c52..d1b449b3c7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a | b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bor_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint64.c index d3e47e9b73..5aeabfd7e2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a | b) ; z = ~(z ^ x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__bxnor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__bxnor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bor_uint64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint8.c index 87ce938e14..1c9d218736 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a | b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bor_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint16.c index 2532966577..a475f6537e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxnor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ~(a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint32.c index 970012658e..24ab6d1ade 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxnor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ~(a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint64.c index 0aaa788258..9324cf2253 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxnor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ~(a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__bxnor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__bxnor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint8.c index 31aa0637bf..123425e8f1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxnor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxnor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxnor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ~(a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bxnor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxnor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint16.c index 61e49a4bb6..2458d95bdb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxor_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint32.c index 673f2efc8d..ace4f296d6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxor_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint64.c index 5f278b4a5e..10ec9af21c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__bxnor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__bxnor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxor_uint64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint8.c index c7def1b4cc..0ca11d73b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxnor_bxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxnor_bxor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxnor_bxor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a ^ b) ; z = ~(z ^ x_op_y) ; } @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__bxnor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__bxnor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__bxnor_bxor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxnor_bxor_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__bxnor_bxor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__bxnor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__bxnor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint16.c index abda2e5a88..7b03a36a77 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_band_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a & b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_band_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_band_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint32.c index a49c4dbb38..3bc60b4613 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_band_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a & b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_band_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_band_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint64.c index a89ec8cecb..de0c8d8dda 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_band_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a & b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_band_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_band_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint8.c index 3dec2d0a81..7568f68910 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_band_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_band_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_band_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a & b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_band_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_band_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_band_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_band_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint16.c index 65f24c702b..368a08084d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a | b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bor_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint32.c index f8fee33e87..8d1974a0a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a | b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bor_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint64.c index b3127a4661..1e0cd013cc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a | b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bor_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint8.c index 83e5102d17..f944b69568 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a | b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bor_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint16.c index f78ec1a8f7..ae8fe28c07 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxnor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ~(a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxnor_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxnor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint32.c index 5c806e7746..719653b0b7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxnor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ~(a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxnor_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxnor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint64.c index 6f40582f25..c434c2f763 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxnor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ~(a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxnor_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxnor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint8.c index 57e8f7bbe6..df0e1fef37 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxnor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxnor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxnor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ~(a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxnor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxnor_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxnor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxnor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint16.c index 74dc621caa..05097c546a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxor_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint32.c index fbb61ab30e..19becdeb11 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxor_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint64.c index 86ca328547..9be7525e14 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxor_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint8.c index c08aca542c..ce9f86e5c7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__bxor_bxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__bxor_bxor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__bxor_bxor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a ^ b) ; z ^= x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__bxor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__bxor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__bxor_bxor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__bxor_bxor_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__bxor_bxor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__bxor_bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__bxor_bxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_bool.c index e89e25dbce..bf05d672f4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_fp32.c index ed2beb8051..0e8de12e61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_fp32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_fp64.c index dfdc3d5172..f7bc6eea79 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_fp64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int16.c index f691f7eef6..2b806e0ad4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_int16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int32.c index 19938db647..c0aab6668e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_int32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int64.c index 7c4d430d93..11268d027c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_int64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int8.c index 316ba3aaa3..bba974cd9d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_int8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_int8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint16.c index 0dc42cf6d0..2f46e7acdf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint32.c index 0e51252803..bdc1b0b99c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint64.c index d9213bca4d..5c8c273d27 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_uint64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint8.c index 66e311564a..fb273f64c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_eq_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_eq_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a == b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_eq_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_eq_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_eq_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_first_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_first_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_first_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_first_bool.c index c577e20cd6..79d6aab1be 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_first_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_first_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == a) @@ -61,7 +63,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -82,7 +84,7 @@ GrB_Info GB (_Adot2B__eq_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -105,7 +107,7 @@ GrB_Info GB (_Adot3B__eq_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -131,7 +133,7 @@ GrB_Info GB (_Adot4B__eq_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -140,7 +142,7 @@ GrB_Info GB (_Adot4B__eq_first_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_first_bool) ( @@ -169,7 +171,7 @@ GrB_Info GB (_AsaxbitB__eq_first_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_Asaxpy4B__eq_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -230,7 +232,7 @@ GrB_Info GB (_Asaxpy4B__eq_first_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -248,7 +250,7 @@ GrB_Info GB (_Asaxpy4B__eq_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__eq_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__eq_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -381,8 +383,8 @@ GrB_Info GB (_Asaxpy3B__eq_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -390,8 +392,8 @@ GrB_Info GB (_Asaxpy3B__eq_first_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -433,8 +435,8 @@ GrB_Info GB (_Asaxpy3B__eq_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -442,8 +444,8 @@ GrB_Info GB (_Asaxpy3B__eq_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_bool.c index 6b61e4ca65..d815a3f97a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_fp32.c index ba74fb9fe5..005f5a76e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_fp32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_fp64.c index b69bcaad0f..69a7bf783f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_fp64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int16.c index f93939dc1e..b8aa287683 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_int16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int32.c index 287d2daf04..de6597610a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_int32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int64.c index 0ebdfd19df..141af7ec43 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_int64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int8.c index e90d1b9498..6f3e910abe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_int8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_int8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint16.c index 161bbb66af..b1e3778452 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint32.c index 443782d5b4..19ce0c196e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint64.c index b6a67e213b..6669eb7891 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_uint64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint8.c index 532ae20776..ee6c6431c2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ge_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ge_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a >= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ge_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ge_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ge_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_bool.c index e752a612e8..4af5604109 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_fp32.c index 652ec2f993..a6510db291 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_fp32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_fp64.c index 46111d4215..3b9bf177d3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_fp64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int16.c index 95fe3129e5..7d009246d6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_int16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int32.c index 63686c25d4..f4a7588975 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_int32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int64.c index d449daf3be..2aa05d2bd2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_int64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int8.c index d83784d013..ab332d2684 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_int8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint16.c index c3d1e20e77..a1f786c915 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint32.c index 95201d64ea..4ca7d16a1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint64.c index 25779d2c0a..d4e7228bfc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_uint64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint8.c index ea06322001..5110432c4f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_gt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_gt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a > b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_gt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_gt_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_gt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_land_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_land_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_land_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_land_bool.c index eb3deb0938..5e58eb058f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_land_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_land_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a && b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_land_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_land_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_land_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_land_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_land_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_bool.c index 3d37118475..994d72d4c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_fp32.c index 328f446597..a426596f61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_fp32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_fp64.c index 4ced55df5b..6c1f323265 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_fp64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_int16.c index 5cebc468a0..8cbf33045d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_int16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_int32.c index 4ae551fb44..7764d33820 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_int32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_int64.c index 073ab17c68..ccb6287a63 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_int64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_int8.c index dbd1fd0398..4594b3d3a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_int8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_int8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint16.c index 708455f68d..055c197a34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint32.c index 85d1845e25..988edfb471 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint64.c index c33e3b6f29..e96a30e4d1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_uint64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint8.c index fced3ca614..0e419b2bac 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_le_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_le_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a <= b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_le_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_le_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_le_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lor_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lor_bool.c index b01526a1a5..e4090e9923 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a || b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lor_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_bool.c index 34125adc5f..45191ec887 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_fp32.c index a487329fd9..2a679bda98 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_fp32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_fp64.c index d92af3c0e0..70cc8f4f6d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_fp64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int16.c index 05b401fc1c..4c3d7f75f1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_int16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int32.c index 4270eb86f8..dcaf54166d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_int32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int64.c index 7e9beef91e..701d2608a6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_int64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int8.c index e4e37eacc7..9f870d3357 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_int8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint16.c index c2b17eaedd..b9025ad2b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint32.c index 9ce1518b97..02b37ec8cb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint64.c index dd2961fbb8..e7bcb49600 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_uint64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint8.c index ac612888c8..eb1ba1bce4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a < b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lt_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lxor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_lxor_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_lxor_bool.c index 8ab89a9ecf..02e41fa30c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_lxor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_lxor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_lxor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_lxor_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_lxor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_lxor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_lxor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_fp32.c index 4ebcd26895..85517a0bca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_fp32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_fp64.c index 93f058ea58..64ce2b5276 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_fp64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int16.c index f5d90cadfe..00e956b483 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_int16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int32.c index b77a98d3f3..a843216151 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_int32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int64.c index 78d494def1..7485d1a92a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_int64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int8.c index bda9d9eadb..5e6ce83c51 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_int8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_int8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint16.c index 06f6eaeed4..d3a9b7f850 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_uint16) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint32.c index dbfbf9844c..ddbcaf0e0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_uint32) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint64.c index 0337649a05..fa0bffff05 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_uint64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint8.c index f1aba51ed9..34c63f61b9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_ne_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__eq_ne_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == (a != b)) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_ne_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_ne_uint8) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_ne_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_second_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__eq_second_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__eq_second_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__eq_second_bool.c index 3587ed0ee4..fc9ffb8494 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__eq_second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__eq_second_bool.c @@ -2,15 +2,17 @@ // GB_AxB__eq_second_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = (z == b) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__eq_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__eq_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__eq_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__eq_second_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__eq_second_bool) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__eq_second_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__eq_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__eq_second_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__eq_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__eq_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__eq_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__eq_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__eq_second_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__eq_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__eq_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__include2.h b/GraphBLAS/FactoryKernels/GB_AxB__include2.h similarity index 99% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__include2.h rename to GraphBLAS/FactoryKernels/GB_AxB__include2.h index f662aa1138..0811dc17d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__include2.h +++ b/GraphBLAS/FactoryKernels/GB_AxB__include2.h @@ -2,11 +2,11 @@ // GB_AxB__include2.h: definitions for GB_AxB__*.c methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_AxB.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_Adot2B__plus_pair_int8) ( diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_bool.c index aa1a4d814c..8e777250d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_fp32.c index 4523976a5a..3833e7b028 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_fp64.c index 436569bae1..a42996c7ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_int16.c index cb41fe2dcb..25b9839e23 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int16.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_int32.c index 5c23d0c579..bb16bed345 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int32.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_int64.c index 3855ef95de..f45990736f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int64.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_int8.c index 9d0cc55133..8baaa55d1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_int8.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint16.c index 0da82c3689..b96cba2c3a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint32.c index 41e1a55e01..10bd1c1128 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint64.c index e7f908a44a..6226f27369 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint8.c index 8a15c4acd6..a55d68140b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_eq_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__land_eq_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_eq_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_eq_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_eq_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_first_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_first_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_first_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_first_bool.c index fdfd576162..ea87563e08 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_first_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_first_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= a @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__land_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__land_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__land_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__land_first_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_first_bool) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__land_first_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__land_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__land_first_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__land_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__land_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__land_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__land_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__land_first_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__land_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__land_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_bool.c index f4083b462b..1094462b6d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_fp32.c index a2b10659ab..61abebc805 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_fp64.c index 11460fd8c2..5d3de622c9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_int16.c index 28a8f342b8..f727dd029f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int16.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_int32.c index fc7308938f..caf93ab84d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int32.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_int64.c index b0be62faa2..dfd54e8a57 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int64.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_int8.c index ba34eb470d..91fa28943f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_int8.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint16.c index bd9c766f0f..759f3a2cf8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint32.c index 7d88cab6ac..5665015bee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint64.c index 42b5130f61..9b33d6a9a8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint8.c index 228414ff78..1a2481d42f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ge_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__land_ge_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ge_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ge_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ge_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_bool.c index a644a8627c..0eb2829f68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_fp32.c index b8bdeeaa3e..754c4f4c31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_fp64.c index d87f0690ea..c0454880b7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_int16.c index 90ca97f0e3..b55a064b80 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_int32.c index 9b4e285471..122a645465 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_int64.c index f3dbb1381b..9d81959e5c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_int8.c index a287c8c13c..fcf051cd98 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint16.c index 75624ffb62..7e57c5dc42 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint32.c index a96fbd1b44..509c293e1b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint64.c index 43201acd33..4706bd0b80 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint8.c index 6380d2077a..2eaf192f34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_gt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__land_gt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_gt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_gt_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_gt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_land_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_land_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_land_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_land_bool.c index 8162b0fdc2..0f0374b6a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_land_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_land_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a && b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_land_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_land_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_land_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_land_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_land_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_bool.c index cd8e526333..c87ca628ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_fp32.c index 557f5dede6..6d41077c9d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_fp64.c index bcac0d668e..921ab81137 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_int16.c index fb5c7c4fc4..080bcf439b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int16.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_int32.c index 46bcc2bc49..d061e2cacb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int32.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_int64.c index 1de5e4f946..2538d0ce6e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int64.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_int8.c index 43dcbc297e..21df7113bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_int8.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_uint16.c index 10660de840..aab6838e20 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_uint32.c index 1d8f744d29..f5e090e1cb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_uint64.c index fe63855f53..454385b2dc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_le_uint8.c index 58ce9f1045..4eaf292401 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_le_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__land_le_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_le_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_le_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_le_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lor_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lor_bool.c index f2716656c1..6001ea2f69 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_lor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a || b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lor_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_bool.c index 751c912f2f..2b0050dabb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_fp32.c index 1cf9db93e0..27bf5d85d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_fp64.c index 8896dc6d9a..09d65cabb9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_int16.c index 4f71680dcd..5ea4481dee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_int32.c index b76d1085f5..812d090993 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_int64.c index 2c4b3b6c2e..5f38bfb5d0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_int8.c index 9a25466878..680a09edbe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint16.c index 9982b397b4..aecde97485 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint32.c index 991265daa9..8a33f04364 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint64.c index 3d16334452..b22b0b4d43 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint8.c index 1fcaa94b1b..e5b8e26af3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__land_lt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lt_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lxor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_lxor_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_lxor_bool.c index 8722943235..89f7c377a8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_lxor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_lxor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_lxor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_lxor_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_lxor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_lxor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_lxor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_fp32.c index 4220a23e61..3fa67157ac 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_fp64.c index 5db663dfae..0b1d054a1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_int16.c index a95974ad96..b62a2c2537 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int16.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_int32.c index 16f02a4a6a..48fe4b7db0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int32.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_int64.c index d3e05370e5..56bc3efb45 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int64.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_int8.c index 332c597fbe..ba33121fc5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_int8.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint16.c index 14d14f1d0a..5799abfc98 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint32.c index 1264da81fa..ef6b73db4e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint64.c index 6a6e0543fc..9fb7e34fb0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint8.c index f505ec4de3..11d1437d6d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_ne_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__land_ne_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_ne_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_ne_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_ne_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_second_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__land_second_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__land_second_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__land_second_bool.c index 1c0c02a651..d1b3f954ee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__land_second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__land_second_bool.c @@ -2,15 +2,17 @@ // GB_AxB__land_second_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z &= b @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__land_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__land_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__land_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__land_second_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__land_second_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__land_second_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__land_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__land_second_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__land_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__land_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__land_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__land_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__land_second_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__land_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__land_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_bool.c index e580979463..f71067f776 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_fp32.c index bd33e4ea15..16d1bf2dce 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_fp64.c index 3c4573f12d..46593f5f5b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int16.c index 05c7342e9c..e5e511869e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int32.c index 7b13e754dd..8cb6ebe4c7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int64.c index d5d44ef12a..22c10ec0ac 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int8.c index 9af2d09d00..8cec3603fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint16.c index 9ebe90f25e..70144da84b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint32.c index 7f22204a95..622537dcb8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint64.c index 8e93f45eea..48b07bbc2d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint8.c index 724e6fcbaf..e40a143730 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_eq_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_eq_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a == b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_eq_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_eq_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_eq_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_first_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_first_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_first_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_first_bool.c index ec2c493f6c..2dd69d1212 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_first_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_first_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= a @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__lor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__lor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__lor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__lor_first_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_first_bool) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__lor_first_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__lor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__lor_first_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__lor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__lor_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__lor_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__lor_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__lor_first_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__lor_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__lor_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_bool.c index 33eb16249e..d20b63bbb8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_fp32.c index d7b6336d64..cf1de89bea 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_fp64.c index 7ee24b6b41..b5e7865c33 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int16.c index 8d80a1af91..e2dfd3b053 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int32.c index 214df79d91..98043d7443 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int64.c index 06836b059d..13e0266cda 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int8.c index 881794fc96..8b95a55299 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint16.c index 66f331ed45..1efc0f7c15 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint32.c index 753fa291ae..08c1cbf86b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint64.c index c5db73266e..a6a22fba83 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint8.c index e0cd9ecdbb..47083b89c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ge_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ge_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a >= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ge_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ge_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ge_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_bool.c index 6746d104cb..980fce66eb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_fp32.c index ef21570153..b6626ba97c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_fp64.c index e01b962ea6..f811dcc56f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int16.c index 57b1949e9f..41b36b95e8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int32.c index 884ce4435b..be13cd66bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int64.c index 0bd8671364..0da1ca7ce0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int8.c index 826e58bc8f..8118e60ffe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint16.c index 7c220c2a87..dbc2df3290 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint32.c index 59c92d0bf9..aca20c5cee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint64.c index 359a80d111..520b3faa35 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint8.c index 5327f34161..66edbc2094 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_gt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_gt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a > b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_gt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_gt_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_gt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_land_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_land_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_land_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_land_bool.c index 5b3e94a968..52221bca5a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_land_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_land_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a && b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_land_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_land_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_land_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_land_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_land_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_bool.c index 4e52303c12..3b9a4c4357 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_fp32.c index 007b4b216e..d2c237db1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_fp64.c index 84cdf0978f..4feaba3aa6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_int16.c index e7c4d9eac5..dcd71669a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_int32.c index 59eeb715a8..607d7ff10f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_int64.c index 1f19bcaff9..f0fe8a3d1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_int8.c index a6582b9651..6c2c8eca41 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint16.c index 384f3d566c..e613cfad27 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint32.c index 82db4375b3..ff6e8f7840 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint64.c index 9ec85be719..537586ec2f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint8.c index d689800daf..131d6e020e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_le_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_le_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a <= b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_le_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_le_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_le_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lor_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lor_bool.c index be12019104..f981ac8d62 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a || b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lor_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_bool.c index b502f7cab6..d5e97eaeb1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_fp32.c index c0ef5d4f3c..fd0e558ad2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_fp64.c index b82ad77877..642297a1dc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int16.c index 6a7aaac5c8..9c1ebd2974 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int32.c index 99dee2514c..ac40080765 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int64.c index a97cd287f3..9389b643c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int8.c index e00d34f167..9f71437831 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint16.c index 1093307b5d..27b86dfa09 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint32.c index 3d855e289a..25aea0d7fc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint64.c index 0be2f77fc2..e8ff208bfa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint8.c index 453e9b7b74..40bdf2c6a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a < b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lt_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lxor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_lxor_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_lxor_bool.c index 0f9e5b4825..866d5b53f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_lxor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_lxor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_lxor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_lxor_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_lxor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_lxor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_lxor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_fp32.c index aa5f20548a..b5d4d52ce1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_fp32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_fp64.c index 500f5acf98..4733ed57f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_fp64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int16.c index 922053fa53..b232e24cba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int32.c index 63f1dc1c86..17581f5555 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int64.c index 9294b30c9d..acc7c62127 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int8.c index 7d8999124c..ae304ac6b0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint16.c index d6eda3a736..e5b973b3c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint32.c index b1c6d14bec..418a04a931 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint64.c index 5dc7099700..48cf7ab1de 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint8.c index 7ef7914168..517bd2e4e4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_ne_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lor_ne_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= (a != b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_ne_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_ne_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_ne_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_second_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lor_second_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lor_second_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lor_second_bool.c index 35112cf2f2..e9ec38e769 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lor_second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lor_second_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lor_second_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z |= b @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__lor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__lor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__lor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__lor_second_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lor_second_bool) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__lor_second_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__lor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__lor_second_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__lor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__lor_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__lor_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__lor_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__lor_second_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__lor_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__lor_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_bool.c index 8f866f6743..c0f7741d31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_fp32.c index bdc3400f67..9b012ad7ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_fp64.c index 581046d24e..59b816e4fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int16.c index e960116b95..9d2f90a12a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int32.c index 34e021aaef..58d738fc68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int64.c index 3f72764d42..f15d5f3c6f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int8.c index 696fda8eee..3072f1d1b4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint16.c index e5ac29b35c..c9fc27b849 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint32.c index 487d409285..e6db83e8f5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint64.c index ae0a6460b1..176368f4de 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint8.c index 15ca583bdb..541af0b01c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_eq_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_eq_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a == b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_eq_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_eq_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_eq_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_eq_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_first_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_first_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_first_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_first_bool.c index b7b22b5d0f..691a86ff83 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_first_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_first_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__lxor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__lxor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__lxor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__lxor_first_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_first_bool) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__lxor_first_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__lxor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__lxor_first_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__lxor_first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__lxor_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__lxor_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__lxor_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__lxor_first_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__lxor_first_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__lxor_first_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_bool.c index f361b11d4c..72866df8fe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_fp32.c index 064da37e87..9025b81e2f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_fp64.c index c716134880..9faf6a79a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int16.c index 9b385eb66c..1a85b8c319 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int32.c index abc4d09280..cbd9301629 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int64.c index d3d031efaf..719a619d49 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int8.c index 2da4d8b66f..ee38f6588e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint16.c index e0c1e5bfae..eb6746fbf5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint32.c index 7823c2ded1..a8bee7f5bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint64.c index 382024c39b..ab34610565 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint8.c index d9254244ce..8d918a788b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ge_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ge_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a >= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ge_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ge_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ge_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ge_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_bool.c index e1dab81f87..6d4e03b8b6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_fp32.c index eefc791cc4..8468330ef3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_fp64.c index d32fdee443..edf21565c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int16.c index f89051eef0..3f4cbbaf00 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int32.c index e916ab27dc..9359ba1538 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int64.c index b200e57842..c61c246003 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int8.c index 95c28867d8..d041de8e22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint16.c index d7c5724b1f..e4e19698b6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint32.c index 63716cfeea..9c18cf2edc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint64.c index 17a75ca5c6..4ab3121246 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint8.c index 567584e84c..5ed5ecb9d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_gt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_gt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a > b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_gt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_gt_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_gt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_gt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_land_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_land_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_land_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_land_bool.c index 71ac713151..252e6449b0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_land_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_land_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a && b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_land_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_land_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_land_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_land_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_land_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_land_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_land_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_bool.c index 953c5d8732..68f8df94d5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_fp32.c index 334803ee3d..a4a46a001d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_fp64.c index f04c2b49f1..f5e3b0e27d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int16.c index a340036297..46c114c030 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int32.c index 70f088fa88..a29b310978 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int64.c index 71afa27840..4785a3874d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int8.c index 4905d34065..6f6574bc50 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint16.c index 78045d804c..dd67424603 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint32.c index 6de7796d1f..66403998bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint64.c index 2ddcd90a1d..6503984ebc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint8.c index fe2b36da7d..502ca7ded8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_le_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_le_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a <= b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_le_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_le_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_le_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_le_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lor_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lor_bool.c index 9efeae80f1..e26503cbfa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a || b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lor_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_bool.c index 9c1bdb4ed9..b0ef9f97f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_fp32.c index 9fbbb8ce55..e5191eea4f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_fp64.c index 4bfcd91a18..cfc37665b0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int16.c index a5fbddef60..2650a2d618 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int32.c index c33b7ad3bf..8fa594441e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int64.c index f060ca2d13..c4ee865c0a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int8.c index bfce607cdf..f687f71c8b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint16.c index 23c4aa9933..fb4e4b6836 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint32.c index 15441e9ce6..aeee25412f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint64.c index a1fedcfa6f..549d9a3124 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint8.c index 6d5f9af158..63b74723a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lt_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lt_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a < b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lt_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lt_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lt_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lt_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lxor_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lxor_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_lxor_bool.c index d2d8163201..e0ddc68ecd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_lxor_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_lxor_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_lxor_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_lxor_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_lxor_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lxor_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lxor_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lxor_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_lxor_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_fp32.c index b6f53fb1f3..9d09abccbd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_fp64.c index 5b10a39e78..f3b16dcdc2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int16.c index f6baccaa1e..447eeba93c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int32.c index b81b2f1cd0..d489109742 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int64.c index e3d367b8a4..6e95ac6ed3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int8.c index c10c92743f..d0c4ba35fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_int8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint16.c index 61bf6ff4b6..876817fca6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint32.c index 2b727eced9..5f06f93a4f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint64.c index c4053aea51..1352d54bdd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint8.c index e559fdeb2f..821ad17d3f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_ne_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_ne_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= (a != b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_ne_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_ne_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_ne_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_ne_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_pair_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_pair_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_pair_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_pair_bool.c index f584813c72..40de7ead7d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_pair_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_pair_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_pair_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= 1 @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__lxor_pair_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__lxor_pair_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__lxor_pair_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__lxor_pair_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_pair_bool) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__lxor_pair_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__lxor_pair_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__lxor_pair_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__lxor_pair_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__lxor_pair_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__lxor_pair_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__lxor_pair_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__lxor_pair_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__lxor_pair_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__lxor_pair_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_second_bool.c b/GraphBLAS/FactoryKernels/GB_AxB__lxor_second_bool.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_second_bool.c rename to GraphBLAS/FactoryKernels/GB_AxB__lxor_second_bool.c index 1680788c0c..d70b85afd6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__lxor_second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__lxor_second_bool.c @@ -2,15 +2,17 @@ // GB_AxB__lxor_second_bool.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z ^= b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__lxor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__lxor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__lxor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__lxor_second_bool) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__lxor_second_bool) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__lxor_second_bool) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__lxor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__lxor_second_bool) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__lxor_second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__lxor_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__lxor_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__lxor_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__lxor_second_bool) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__lxor_second_bool) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__lxor_second_bool) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_fp32.c index 14456fcbb6..15b117a200 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, (a/b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_div_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_div_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_div_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_fp64.c index 5d2f598cc7..9e928b370c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, (a/b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_div_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_div_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_div_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_int16.c index 67c8c32d21..b0d3ec6102 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_div_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_div_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_int32.c index 7a678a5794..9382d1985c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_div_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_div_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_int64.c index 917a56660a..31a348c546 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_div_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_div_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_int8.c index b260d60ca7..a97fbde36c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_div_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_div_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_uint16.c index 7237c1554d..5347e5d999 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_div_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_div_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_uint32.c index d8a835f0c9..b1e10dec59 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_div_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_div_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_uint64.c index ddbc1f2d59..8d833e3e26 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_div_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_div_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_div_uint8.c index 6bc4175580..1c57d5abc7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_div_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_div_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_div_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_div_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_div_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_fp32.c index b1b103af9d..3c7a1fd5f7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, a) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__max_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__max_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__max_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__max_first_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_fp32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__max_first_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__max_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__max_first_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__max_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_fp64.c index 548fe830ae..344417af0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, a) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__max_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__max_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__max_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__max_first_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_fp64) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__max_first_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__max_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__max_first_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__max_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__max_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_int16.c index 320d646180..94c246212d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_first_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_int16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_first_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_int32.c index 69f73d45b0..b66c6a5f66 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_first_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_int32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_first_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_int64.c index 532dff1245..04dfc5ce7c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_first_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_int64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_first_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_int8.c index 594f284289..0ce73fc39e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_first_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_int8) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_first_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_uint16.c index 9337349b19..279d1e0b77 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_first_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_uint16) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_first_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_uint32.c index f0e975052d..24eeac6830 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_first_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_uint32) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_first_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_uint64.c index b90da37d9f..00ee1cedc7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -70,7 +72,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -91,7 +93,7 @@ GrB_Info GB (_Adot2B__max_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_Adot3B__max_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -140,7 +142,7 @@ GrB_Info GB (_Adot4B__max_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -149,7 +151,7 @@ GrB_Info GB (_Adot4B__max_first_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_uint64) ( @@ -178,7 +180,7 @@ GrB_Info GB (_AsaxbitB__max_first_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -206,7 +208,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -257,7 +259,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -349,8 +351,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -390,8 +392,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -399,8 +401,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -442,8 +444,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -451,8 +453,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_first_uint8.c index ba186a6a7f..648adaa9ab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_first_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_first_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = a ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_first_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_first_uint8) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_first_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firsti1_int32.c index 1b85fb3df7..fcf0ab2a81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_firsti1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (i+1) ; z = GB_IMAX (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__max_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__max_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__max_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__max_firsti1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firsti1_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__max_firsti1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firsti1_int64.c index 6197258c4e..f772a473b0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_firsti1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (i+1) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_firsti1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firsti1_int64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_firsti1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firsti_int32.c index 7e6249f3fc..c5c8652dbc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_firsti_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = i ; z = GB_IMAX (z, x_op_y) ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__max_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__max_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__max_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__max_firsti_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firsti_int32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__max_firsti_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firsti_int64.c index d968e61813..9371cecfcd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firsti_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firsti_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_firsti_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = i ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_firsti_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firsti_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_firsti_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firstj1_int32.c index f4aa74c17b..cfba5aa541 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_firstj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (k+1) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_firstj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firstj1_int32) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_firstj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firstj1_int64.c index dee630a06a..30df9a94c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_firstj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (k+1) ; z = GB_IMAX (z, x_op_y) ; } @@ -70,7 +72,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -91,7 +93,7 @@ GrB_Info GB (_Adot2B__max_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_Adot3B__max_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -140,7 +142,7 @@ GrB_Info GB (_Adot4B__max_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -149,7 +151,7 @@ GrB_Info GB (_Adot4B__max_firstj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firstj1_int64) ( @@ -178,7 +180,7 @@ GrB_Info GB (_AsaxbitB__max_firstj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -206,7 +208,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -257,7 +259,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -349,8 +351,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -390,8 +392,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -399,8 +401,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -442,8 +444,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -451,8 +453,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firstj_int32.c index 718a2ced8b..29a4890155 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_firstj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = k ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_firstj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firstj_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_firstj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_firstj_int64.c index f43b626f11..70ce0b388b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_firstj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_firstj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_firstj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = k ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_firstj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_firstj_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_firstj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_fp32.c index 1a2861db9f..35334c5f68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, fmaxf (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_max_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_max_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_max_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_fp64.c index 16c9be0f3d..a9dfb27d64 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, fmax (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_max_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_max_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_max_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_int16.c index 74622de240..09c5a74edd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_max_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_max_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_int32.c index 4a6fc4e6c4..5dd42825c9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_max_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_max_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_int64.c index e377bd591f..20ee1cb964 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_max_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_max_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_int8.c index 002549494c..7e546547cc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_max_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_max_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_uint16.c index 2aded4b5f1..e294bdcbf3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_max_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_max_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_uint32.c index 05f6254587..ff2868ffad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_max_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_max_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_uint64.c index 48d2e94806..8f993049ad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_max_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_max_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_max_uint8.c index 8432dfd990..9933dc04da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_max_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_max_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMAX (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_max_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_max_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_max_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_fp32.c index e5a7e24d68..fdce666577 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, fminf (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_min_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_min_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_min_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_fp64.c index 956e841f24..3d9a40e611 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, fmin (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_min_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_min_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_min_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_int16.c index 3b8bb572ea..4ffe690383 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_min_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_min_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_int32.c index 26bf365431..2b3260861e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_min_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_min_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_int64.c index 417ecf4d0a..113b48d3ee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_min_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_min_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_int8.c index 23c4481419..18e8b22432 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_min_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_min_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_uint16.c index e14e2b71fe..a76506cdb5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_min_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_min_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_uint32.c index 87a29fb6c7..104f3bb478 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_min_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_min_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_uint64.c index bcc6b155ee..b5b7a1ee8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_min_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_min_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_min_uint8.c index c4c1434f57..c4a5dfc1e8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_min_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_min_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMIN (a,b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_min_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_min_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_min_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_fp32.c index bb1d3b75a2..c74a465918 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, (a-b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_minus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_minus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_fp64.c index 560a807e6d..c3c3a1d8ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, (a-b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_minus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_minus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_int16.c index adde90f215..c7df2755b0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_minus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_minus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_int32.c index 67cd71389b..96e939360b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_minus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_minus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_int64.c index ec2aba60a6..f8766d5cc0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_minus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_minus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_int8.c index 8370bdca35..7c2e64b8b8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_minus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_minus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint16.c index 8e57bde802..47fccbd81a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_minus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_minus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint32.c index 37fd17c886..b2999e0f14 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_minus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_minus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint64.c index ba4b2da95c..8038196e42 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_minus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_minus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint8.c index 849e7094d7..baa87e3de4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_minus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_minus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a-b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_minus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_minus_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_minus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_fp32.c index c64d04cff7..b47638b2ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, (a+b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_plus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_plus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_fp64.c index 64f6e9eb50..61289597ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, (a+b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_plus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_plus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_int16.c index 482f4b446c..7d7056f031 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_plus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_plus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_int32.c index 359cef4912..9365c7e53d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_plus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_plus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_int64.c index 11fa9d04f5..cb7540edb1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_plus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_plus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_int8.c index 3d9c1fb46f..a5d5f070c7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_plus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_plus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint16.c index 3eaca27f08..400cdfe6b0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_plus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_plus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint32.c index 152a3938e3..33e8a7a2fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_plus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_plus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint64.c index 1e785733e7..7f47ddb20d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_plus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_plus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint8.c index 581cab0c2e..559a7a11e4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_plus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_plus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a+b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_plus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_plus_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_plus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_fp32.c index 9bd42d3804..47e496f521 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, (b/a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_rdiv_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_fp64.c index cf1851c73f..8c9287f744 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, (b/a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_rdiv_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int16.c index f4b552fd53..19aeb3034b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int32.c index c5b3ba2682..1f0be5c64c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int64.c index 48ecd3fc00..f747e11fa2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int8.c index 5a6b61cd2c..580e37b631 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rdiv_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint16.c index 09c1e75ec9..0db9925cf4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint32.c index 2dc60d4736..7bbe0ed285 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint64.c index 59c0582b0b..41d9133ee2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint8.c index 114049eb74..c3fdc430bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rdiv_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_rdiv_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (b, a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rdiv_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rdiv_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rdiv_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_fp32.c index 9a5648dfb4..4ce1abded3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, (b-a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_rminus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_fp64.c index 0122c320f5..db37dee25e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, (b-a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_rminus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int16.c index 1a8db3b1a8..e047e2e626 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_rminus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int32.c index cc36beb662..af6b7bff2d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_rminus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int64.c index b6ac08ea96..828eb58c61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_rminus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int8.c index 8ace8e14db..28c0e98fe7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rminus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint16.c index f305bc94bf..e1976bddb0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint32.c index 290180412f..abc696ad6b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint64.c index 564e8484f4..65456f5e24 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint8.c index fdc9f81933..a233cc087c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_rminus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_rminus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (b-a) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_rminus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_rminus_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_rminus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_fp32.c index 87a789434f..2e2bf3e162 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_second_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_second_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_second_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_fp64.c index 08546db18d..55c8795d53 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_second_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_second_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_second_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_int16.c index fa6fd114f1..23573abe38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_second_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_second_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_int32.c index 748ddc73b9..ff7d9636be 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_second_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_second_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_int64.c index 8e061e698f..2bb86362a0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_second_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_second_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_int8.c index 92d261c672..0d3a7f680d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_second_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_second_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_uint16.c index 6a286ee42b..d926da00ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_second_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_second_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_uint32.c index 54805b371b..06c4a85ac0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_second_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_second_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_uint64.c index 5d02dd5f1d..e5764a1e71 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_second_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_second_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_second_uint8.c index cfa210d1ee..6474ec2d59 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_second_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_second_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = b ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_second_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_second_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_second_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_secondj1_int32.c index be0054da72..268ccb7ba1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_secondj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (j+1) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_secondj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_secondj1_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_secondj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_secondj1_int64.c index 450f69f651..809eee28bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_secondj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (j+1) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_secondj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_secondj1_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_secondj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_secondj_int32.c index f3d7578c75..e979bc1b5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_secondj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = j ; z = GB_IMAX (z, x_op_y) ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__max_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__max_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__max_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__max_secondj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_secondj_int32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__max_secondj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_secondj_int64.c index d114e79d81..62f3a65617 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_secondj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_secondj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_secondj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = j ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_secondj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_secondj_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_secondj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_fp32.c index b28dbb3dce..dbb0c5096b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmaxf (z, (a*b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_times_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_times_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_times_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_fp64.c index 234998b703..4c15fb7c04 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmax (z, (a*b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__max_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__max_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__max_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__max_times_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__max_times_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__max_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__max_times_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__max_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__max_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_int16.c index e71b1ef7c3..adb9de65d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int16.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_times_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_times_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_int32.c index 9f1cabd8b1..bcf52945fa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int32.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__max_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__max_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__max_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__max_times_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__max_times_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_int64.c index 56ccac8e65..982ed99a08 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int64.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__max_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__max_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__max_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__max_times_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__max_times_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_int8.c index 50e3759c7a..62f70d6b3f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_int8.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_times_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_times_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_uint16.c index 4e00deaeac..6bf03da8c9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_times_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_times_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_uint32.c index 332de716e4..151fffc177 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_times_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_times_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_uint64.c index fc537bfdd5..dbc64b9380 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__max_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__max_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__max_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__max_times_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__max_times_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__max_times_uint8.c index 9c0dce89c5..e7f2668221 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__max_times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__max_times_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__max_times_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a*b) ; z = GB_IMAX (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__max_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__max_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__max_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__max_times_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__max_times_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__max_times_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__max_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__max_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_fp32.c index 5ecc51f3ab..14881db279 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, (a/b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_div_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_div_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_div_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_fp64.c index dad43bb1ee..bf08c27e22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, (a/b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_div_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_div_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_div_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_int16.c index 513e1b8d52..caa7d9464a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_div_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_div_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_int32.c index 87e86d5650..8e762af781 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_div_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_div_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_int64.c index 12743edf5c..af74f45de7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_div_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_div_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_int8.c index 3ab95adc7b..00af3dee3c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_div_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_div_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_uint16.c index fe21507fc6..e7cc100026 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_div_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_div_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_uint32.c index f60173ab13..8b0b824851 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_div_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_div_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_uint64.c index 8b42b7cabf..3a0140e74a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_div_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_div_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_div_uint8.c index 4ea90732f4..0e3096405b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_div_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_div_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_div_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_div_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_div_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_fp32.c index 0692828dff..788468de68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, a) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__min_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__min_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__min_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__min_first_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_fp32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__min_first_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__min_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__min_first_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__min_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_fp64.c index 7d9a39c249..d2ca7b9e6c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, a) @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__min_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__min_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__min_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__min_first_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_fp64) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__min_first_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__min_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__min_first_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__min_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__min_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_int16.c index b13c8eafd7..557e82f4c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_first_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_int16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_first_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_int32.c index 089f946243..9472453419 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_first_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_int32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_first_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_int64.c index cf3a8c7d26..d6301732bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_first_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_int64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_first_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_int8.c index 1f39855f36..0b3ffe90ab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_first_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_int8) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_first_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_uint16.c index f4d9afc3cf..cc77b95ad4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_first_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_uint16) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_first_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_uint32.c index 922379715c..3461137fcb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_first_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_uint32) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_first_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_uint64.c index f98b413df1..14565c9cda 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -70,7 +72,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -91,7 +93,7 @@ GrB_Info GB (_Adot2B__min_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_Adot3B__min_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -140,7 +142,7 @@ GrB_Info GB (_Adot4B__min_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -149,7 +151,7 @@ GrB_Info GB (_Adot4B__min_first_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_uint64) ( @@ -178,7 +180,7 @@ GrB_Info GB (_AsaxbitB__min_first_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -206,7 +208,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -257,7 +259,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -349,8 +351,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -390,8 +392,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -399,8 +401,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -442,8 +444,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -451,8 +453,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_first_uint8.c index 9676ec1e7a..f6f2f7f674 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_first_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_first_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = a ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_first_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_first_uint8) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_first_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firsti1_int32.c index 28da9d0e43..6b7b8d5500 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_firsti1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (i+1) ; z = GB_IMIN (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__min_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__min_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__min_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__min_firsti1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firsti1_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__min_firsti1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firsti1_int64.c index 7eb9924e9f..688326aab2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_firsti1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (i+1) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_firsti1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firsti1_int64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_firsti1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firsti_int32.c index 4df6c53276..3ebe8b8199 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_firsti_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = i ; z = GB_IMIN (z, x_op_y) ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__min_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__min_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__min_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__min_firsti_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firsti_int32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__min_firsti_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firsti_int64.c index ab8519b5b9..df6c407ae9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firsti_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firsti_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_firsti_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = i ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_firsti_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firsti_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_firsti_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firstj1_int32.c index 381934071c..af72929876 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_firstj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (k+1) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_firstj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firstj1_int32) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_firstj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firstj1_int64.c index 249f1f6a44..4b34cc3be2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_firstj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (k+1) ; z = GB_IMIN (z, x_op_y) ; } @@ -70,7 +72,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -91,7 +93,7 @@ GrB_Info GB (_Adot2B__min_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_Adot3B__min_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -140,7 +142,7 @@ GrB_Info GB (_Adot4B__min_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -149,7 +151,7 @@ GrB_Info GB (_Adot4B__min_firstj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firstj1_int64) ( @@ -178,7 +180,7 @@ GrB_Info GB (_AsaxbitB__min_firstj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -206,7 +208,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -257,7 +259,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -349,8 +351,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -390,8 +392,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -399,8 +401,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -442,8 +444,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -451,8 +453,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firstj_int32.c index 5d3160a21d..ef44067f0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_firstj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = k ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_firstj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firstj_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_firstj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_firstj_int64.c index a5fced7689..33697f0d0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_firstj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_firstj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_firstj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = k ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_firstj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_firstj_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_firstj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_fp32.c index 6c4038314f..f2ae8899a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, fmaxf (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_max_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_max_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_max_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_fp64.c index faa146fb55..cbaf0d2e34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, fmax (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_max_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_max_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_max_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_int16.c index b66e281616..9c6cff2056 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_max_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_max_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_int32.c index 573f126e4f..5f6debb69e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_max_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_max_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_int64.c index 14570d9240..2e367d4148 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_max_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_max_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_int8.c index 5225471767..076e9926e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_max_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_max_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_uint16.c index 0e1c711b8a..c0db9d174c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_max_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_max_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_uint32.c index e9151cd9b6..c7645fe93b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_max_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_max_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_uint64.c index b9be554d8c..077b0d5b05 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_max_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_max_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_max_uint8.c index cd89f3e2ef..61c8698143 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_max_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_max_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMAX (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_max_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_max_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_max_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_fp32.c index 91d218ebcd..831be321bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, fminf (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_min_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_min_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_min_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_fp64.c index 6594450bf0..ca32463037 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, fmin (a,b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_min_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_min_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_min_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_int16.c index 545cda9f67..842b992ad5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_min_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_min_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_int32.c index e4f387c6a5..b3131ecab2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_min_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_min_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_int64.c index 5662301cab..aae696a364 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_min_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_min_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_int8.c index 36122f3fc7..30394b3d9f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_min_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_min_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_uint16.c index ba7fe8d6ee..6ba94058c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_min_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_min_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_uint32.c index da587a41f2..e749336192 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_min_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_min_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_uint64.c index eccd03bcf1..5705914a1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_min_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_min_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_min_uint8.c index 1a3114434d..4a4b598987 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_min_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_min_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMIN (a,b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_min_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_min_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_min_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_fp32.c index a6c5cf5d18..5c6aeb7c26 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, (a-b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_minus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_minus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_fp64.c index 80ef354918..2e057b327d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, (a-b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_minus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_minus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_int16.c index c2dcc20e68..d9b951fb8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_minus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_minus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_int32.c index 812b1ab661..019b8f4ef3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_minus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_minus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_int64.c index c92730f50d..ae43a6c7c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_minus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_minus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_int8.c index 38b3cb038a..d0e9a12465 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_minus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_minus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint16.c index e318410e2c..81ea779143 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_minus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_minus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint32.c index c6612e5b0c..a373e6eb34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_minus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_minus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint64.c index 7d0c5e7920..b58d50d07b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_minus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_minus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint8.c index 244298a259..41bb0d97aa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_minus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_minus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a-b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_minus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_minus_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_minus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_fp32.c index 55b5bf2a64..c592a9ba1d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, (a+b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_plus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_plus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_fp64.c index e3623feae9..680125c4de 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, (a+b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_plus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_plus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_int16.c index 4956aa435f..e5dbc534bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_plus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_plus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_int32.c index 6a87ca1e7d..904d5c0222 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_plus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_plus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_int64.c index 0c35fa545f..8ae8c89d44 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_plus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_plus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_int8.c index 2e91f4cbc7..2865e7a57d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_plus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_plus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint16.c index 7ae55388e8..733b3e6adf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_plus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_plus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint32.c index b29f07817a..2af3a4919c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_plus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_plus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint64.c index 5c576394c6..69dc82be2d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_plus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_plus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint8.c index 7a5b84000b..55cd5f6b1c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_plus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_plus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a+b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_plus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_plus_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_plus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_fp32.c index 95eeff3a92..8e01396c62 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, (b/a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_rdiv_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_fp64.c index 978871302e..47be370044 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, (b/a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_rdiv_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int16.c index f1b957e413..d3799cc4e6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int32.c index f8015afb53..84a4bf0f65 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int64.c index f83239edab..b88a613670 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int8.c index c678575127..9d331a057c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rdiv_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint16.c index d9a77c98f2..24e600785b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint32.c index 5c417ad18c..fa67c9ce19 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint64.c index 559e5bcb95..9a75b5457f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint8.c index ad273d4210..7c0c4b59ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rdiv_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_rdiv_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (b, a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rdiv_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rdiv_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rdiv_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_fp32.c index a820117ca5..64e3d97c06 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, (b-a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_rminus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_fp64.c index b37ce10e0b..6119c05b20 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, (b-a)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_rminus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int16.c index 82172c93bc..ae15dbfadd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_rminus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int32.c index a7f4341d20..2b24bfcf68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_rminus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int64.c index ae197a1e82..43b60d36ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_rminus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int8.c index 410847ce5c..1cae697c1e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rminus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint16.c index ccfb44e668..03f4577455 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint32.c index 4199f861a8..a02b99042e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint64.c index e4ebd50a85..f30b025ff6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint8.c index 139993833b..42902fb190 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_rminus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_rminus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (b-a) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_rminus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_rminus_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_rminus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_fp32.c index ff2ed640ce..f37d4d826d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_second_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_second_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_second_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_fp64.c index 8a85590400..b726404def 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_second_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_second_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_second_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_int16.c index e966368ee8..8e1e34df8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_second_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_second_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_int32.c index 393be7df55..9537f4fd2f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_second_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_second_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_int64.c index 21b64332b0..3ca7ac84d8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_second_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_second_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_int8.c index e48e61d5bb..b2885a571c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_second_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_second_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_uint16.c index b45330ebf5..e7818d8cff 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_second_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_second_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_uint32.c index b066befa3a..41d73b12c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_second_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_second_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_uint64.c index 9a9cb76b06..464d0ad575 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_second_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_second_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_second_uint8.c index 042d13de9b..dd33b09f09 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_second_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_second_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = b ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_second_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_second_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_second_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_secondj1_int32.c index ea8e3e3ca9..da7a6836f8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_secondj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (j+1) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_secondj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_secondj1_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_secondj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_secondj1_int64.c index 021be2cb64..1e8d4a39cd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_secondj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (j+1) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_secondj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_secondj1_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_secondj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_secondj_int32.c index 6264a19d73..5f51ee0f48 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_secondj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = j ; z = GB_IMIN (z, x_op_y) ; } @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__min_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__min_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__min_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__min_secondj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_secondj_int32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__min_secondj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_secondj_int64.c index d9f5d25963..82deaf64ad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_secondj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_secondj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_secondj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = j ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_secondj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_secondj_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_secondj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_fp32.c index c4272f0273..8f66c27ae3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fminf (z, (a*b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_times_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_times_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_times_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_fp64.c index 782772d25c..c558682201 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = fmin (z, (a*b)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__min_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__min_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__min_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__min_times_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__min_times_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__min_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__min_times_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__min_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__min_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_int16.c index b9ff1834e6..c80d3c21ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int16.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_times_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_times_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_int32.c index 6d393b06d6..d7345f2ff6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int32.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__min_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__min_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__min_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__min_times_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__min_times_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_int64.c index b3ac7769b3..06eac019ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int64.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__min_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__min_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__min_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__min_times_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__min_times_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_int8.c index 52ff622d02..f599063789 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_int8.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_times_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_times_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_uint16.c index 23892c539e..f8d35bc1e1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_times_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_uint16) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_times_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_uint32.c index bc4a84ae5d..3556975b55 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_times_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_uint32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_times_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_uint64.c index b3d7969467..dc04559e72 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__min_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__min_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__min_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__min_times_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__min_times_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__min_times_uint8.c index d2c37dc1e4..d384c68348 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__min_times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__min_times_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__min_times_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a*b) ; z = GB_IMIN (z, x_op_y) ; } @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__min_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__min_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__min_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__min_times_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__min_times_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__min_times_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__min_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__min_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_fc32.c index 7ee73534f4..48d4229d6d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_div (a,b) ; z = GB_FC32_add (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_div_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_div_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_fc64.c index d58b585ede..b7a3243b8c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_div (a,b) ; z = GB_FC64_add (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_div_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_div_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_fp32.c index 417f3cdd72..76ced02a73 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a/b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_fp64.c index ef81863bd7..f76c37b124 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a/b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_int16.c index 0bb791e65a..616bca022f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_int32.c index e17d965f73..f54379a563 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_int64.c index b82fd394ba..7215aea923 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_int8.c index fc7379e9db..dfa40c5c30 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint16.c index b94dc61cb3..0ad83321a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint32.c index a71ccb515a..09a7394203 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint64.c index 123deb5906..fe338e94f2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint8.c index 39acb8fb99..f2ba6621d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_div_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_div_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_div_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_div_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_div_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_fc32.c index 5fd09c4ab0..585e6ebefb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC32_add (z, a) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__plus_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__plus_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__plus_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__plus_first_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_fc32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__plus_first_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_fc64.c index 7da357de44..78f54d621d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC64_add (z, a) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_first_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_fc64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_first_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_fp32.c index 750bcbe729..aae98a9fca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_fp32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_fp64.c index f68026c5c3..af7a4cd0ce 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_fp64) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_int16.c index fb79e61933..10cfa677f8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_int16) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_int32.c index a131c4b2e3..a2f36f1a38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_int32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_int64.c index bc6f8d5b15..025f03149c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_int64) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_int8.c index 1078d1ea9c..b47f163f2e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_int8) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint16.c index 1687ebf61d..6194fc9b2a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_uint16) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint32.c index e166b05eb4..d146e48462 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_uint32) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint64.c index ae9a69b3c9..0e36874f95 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_uint64) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint8.c index 8ba6e9b6f4..6d82f7ab24 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_first_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_first_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += a @@ -64,7 +66,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__plus_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__plus_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot4B__plus_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_Adot4B__plus_first_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_first_uint8) ( @@ -172,7 +174,7 @@ GrB_Info GB (_AsaxbitB__plus_first_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -200,7 +202,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -233,7 +235,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -251,7 +253,7 @@ GrB_Info GB (_Asaxpy4B__plus_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -334,8 +336,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -343,8 +345,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -384,8 +386,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -393,8 +395,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B__plus_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firsti1_int32.c index b664ab694c..45e0104d58 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firsti1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (i+1) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__plus_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__plus_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__plus_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__plus_firsti1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firsti1_int32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__plus_firsti1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firsti1_int64.c index a3b74ffda5..500a24b19a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firsti1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (i+1) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__plus_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__plus_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__plus_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__plus_firsti1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firsti1_int64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__plus_firsti1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firsti_int32.c index c169028f5a..f54da8938d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firsti_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += i @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_firsti_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firsti_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_firsti_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firsti_int64.c index dab7745459..d8cf5cba62 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firsti_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firsti_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firsti_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += i @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_firsti_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firsti_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_firsti_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firstj1_int32.c index ea48477936..ee14d542e5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firstj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (k+1) @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_firstj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firstj1_int32) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_firstj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firstj1_int64.c index adc5cb2617..1bba74791e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firstj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (k+1) @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_firstj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firstj1_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_firstj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firstj_int32.c index 89001f7915..67d8396010 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firstj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += k @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_firstj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firstj_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_firstj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_firstj_int64.c index f26119f598..285e3eaa46 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_firstj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_firstj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_firstj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += k @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_firstj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_firstj_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_firstj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_fp32.c index 9df8abaeec..db5ba56658 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += ((a != 0) && (b != 0)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_fp64.c index abee26f08c..d31ee2aa8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += ((a != 0) && (b != 0)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_int16.c index 11884c19be..1e5695dd74 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_int32.c index b8c5b6553a..cc559f51f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_int64.c index 83802ae7ae..6a99f7ab8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_int8.c index 72ad0f48b2..9464d73c8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint16.c index 7a16a8e6d1..794f6177a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint32.c index c0a2d74309..84e2e8557f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint64.c index 55b40749b4..83bb5093d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint8.c index 919f195b75..90582fffef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_land_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_land_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_land_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ((a != 0) && (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_land_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_land_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_land_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_land_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_fp32.c index 0c7967df3c..beefdf421b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += ((a != 0) || (b != 0)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_fp64.c index 48ae42317e..9a70343bfa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += ((a != 0) || (b != 0)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int16.c index 55de2f0e31..2c77a59ad2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int32.c index 0e6445fcda..981609ec28 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int64.c index 5be91ea772..c89045ade8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int8.c index 1fa33c1d10..4f093f17a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint16.c index 69d6a2126a..f608bd76c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint32.c index 6b8116c183..432b0fbbcb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint64.c index ab894c445d..9c8860768a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint8.c index cbb3f687ac..831fd18084 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ((a != 0) || (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lor_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_fp32.c index 59f0088b70..253dae990f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += ((a != 0) != (b != 0)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_fp64.c index a9a9341e7a..f68b03130e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += ((a != 0) != (b != 0)) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int16.c index 2dedec24df..23b301c514 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int32.c index e4b656866d..49abfc6f54 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int64.c index 11ee9866ff..981db9bb2b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int8.c index db3410be1c..420e6b2d79 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint16.c index 7c84f56d53..07d2e49c52 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint32.c index 913a5291e0..8bd4b0a03c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint64.c index a26f44bea3..ef13e833d9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint8.c index b7e6ce4cbd..eba9c9368f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_lxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_lxor_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_lxor_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = ((a != 0) != (b != 0)) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_lxor_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_lxor_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_lxor_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_lxor_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_fp32.c index e5512daa2d..b4c52b5edb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += fmaxf (a,b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_fp64.c index af83446984..ed89ffdde9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += fmax (a,b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_int16.c index 471789e896..0f7138922c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_int32.c index 78f1a71db0..ab744ccca2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_int64.c index e1273dbf65..9c0d420708 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_int8.c index 92d72626ed..8295e1840e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint16.c index ac88c1453e..9e7fe5612a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint32.c index 8b7ec8b5a6..a60e19deaf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint64.c index 5da5f17885..1db9214f99 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint8.c index efdc56e072..159898e2f6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_max_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_max_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMAX (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_max_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_max_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_max_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_fp32.c index 38ac56f883..40b3996b04 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += fminf (a,b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_fp64.c index 06e4c9d5ab..8946808bb5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += fmin (a,b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_int16.c index 7be7dd94f0..c49a7fab82 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_int32.c index ab35250371..176be5b2e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_int64.c index 685add1190..b548aa64f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_int8.c index 3b8070718d..5fecc49430 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint16.c index 3f6cd154f2..47448ccfba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint32.c index d5400ae3e5..ab67500774 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint64.c index e621e3254f..5a1233a5e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint8.c index 85de98e5d9..8353a716af 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_min_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_min_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMIN (a,b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_min_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_min_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_min_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fc32.c index 1af95c6e0a..55ffb2125f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_minus (a,b) ; z = GB_FC32_add (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_minus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fc64.c index 7ef11662d1..bdccac9d3c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_minus (a,b) ; z = GB_FC64_add (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_minus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fp32.c index 103f037061..f209f5a990 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a-b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fp64.c index 4d1c346fe1..69544368f5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a-b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int16.c index ae3d9b6ddf..5d7e46bf41 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int32.c index 659631e47d..b8005efe97 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int64.c index cc4cefc686..90614e6b46 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int8.c index 21798b9fcc..33658d1de6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint16.c index 8fd6975b05..ea57a88603 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint32.c index bff6551335..0cbf469fcd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint64.c index 9a93314d12..9deed4b3a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint8.c index 2f22ca9b39..fb65fdaf0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_minus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_minus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a-b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_minus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_minus_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_minus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fc32.c index 2028ad90e6..c1bb12796e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC32_add (z, GxB_CMPLXF(1,0)) @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_fc32) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fc64.c index ced7779129..1857982f98 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC64_add (z, GxB_CMPLX(1,0)) @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_pair_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_pair_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_pair_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_pair_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_fc64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fp32.c index f727105d91..0874a4d65f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_fp32) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fp64.c index 88fda7d196..0a7258d179 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_fp64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int16.c index 7037bc32fe..6669618f8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_int16) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int32.c index 67b67d2dde..6a2a281ff0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_int32) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int64.c index dd70a82f6f..3c405ae306 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_int64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int8.c index 2fa3940c1f..dfae65b13a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_pair_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_pair_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_pair_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_pair_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_int8) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint16.c index bab4420ab9..18bffa288e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_uint16) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint32.c index 0fe3ce4056..9ea1d1fd39 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_uint32) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint64.c index 03267eb82c..b09770cd7e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -69,7 +71,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -90,7 +92,7 @@ GrB_Info GB (_Adot2B__plus_pair_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -113,7 +115,7 @@ GrB_Info GB (_Adot3B__plus_pair_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -148,7 +150,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_uint64) ( @@ -177,7 +179,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -205,7 +207,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -256,7 +258,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -348,8 +350,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -398,8 +400,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -450,8 +452,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint8.c index cef966e72c..2916803aa5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_pair_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_pair_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_pair_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += 1 @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_pair_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_pair_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_pair_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_pair_uint8) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_pair_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_pair_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_pair_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fc32.c index 75c9fb27fe..60e2b4e289 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_add (a,b) ; z = GB_FC32_add (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_plus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fc64.c index 3d81bd86c3..5a70f42987 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_add (a,b) ; z = GB_FC64_add (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_plus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fp32.c index ec257aea08..208e11ea08 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a+b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fp64.c index e0701c1d44..15c543c3a6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a+b) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int16.c index 3c5be4ef43..47a24b5e05 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int32.c index 992cc9f953..810d34165b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int64.c index 0fa1426ec9..b34ccb151c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int8.c index fabb7c224d..9c1c658468 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint16.c index 052a981eb4..f5be5640ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint32.c index 20485c2f9c..17fcfa4ba9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint64.c index 5d2d836bca..ebe6f76192 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint8.c index b0d066fcc8..b3fff9ff49 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_plus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_plus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a+b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_plus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_plus_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_plus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fc32.c index db79e31e32..3fce2cdf0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_div (b,a) ; z = GB_FC32_add (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fc64.c index 02bcc7cf49..7359fb6380 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_div (b,a) ; z = GB_FC64_add (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fp32.c index 86c2f8b244..0433005f9c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (b/a) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fp64.c index 0340be5316..9c5c33c522 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (b/a) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int16.c index 8f7acabb02..697a6a896a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int32.c index bce229048a..681db76f7e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int64.c index 928d49ef10..e53f1b8e7a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int8.c index 351265094b..0c97b6c2c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint16.c index 3403bf14df..0e8fb68192 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint32.c index 6274fa8bf8..06ab020166 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint64.c index 9a8a967411..5dd600a093 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint8.c index 90366cea03..bfe8996ac0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rdiv_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rdiv_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (b, a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rdiv_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rdiv_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rdiv_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fc32.c index 9679ea4b84..eb5f7cfb9c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_minus (b,a) ; z = GB_FC32_add (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fc64.c index 4526252e10..3f50a091eb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_minus (b,a) ; z = GB_FC64_add (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fp32.c index 108095a43b..b56b1ba5c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (b-a) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fp64.c index 13a134eb60..a69f7610c7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (b-a) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int16.c index 0d4c0a5f6a..cdb09f11ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int32.c index 845cb8311c..a6b950a580 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int64.c index 8344acc32c..f0bdcf1b8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int8.c index b5fe1be66e..58783eeefb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint16.c index 94d78b0fb4..3a16dfcb33 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint32.c index ff9eaba74d..7c16101892 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint64.c index eb7465fa6c..27865d4f91 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint8.c index ba66dd9b13..37b21503c9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_rminus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_rminus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (b-a) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_rminus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_rminus_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_rminus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_fc32.c index 501d20decd..031ffe3f50 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC32_add (z, b) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_second_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_second_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_fc64.c index ba3727820a..98be22ea43 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC64_add (z, b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_second_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_second_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_fp32.c index 5dfd3fb52e..c449eae00d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_fp64.c index 2126999004..a3e17bbed3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int16.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_int16.c index b69e9075e2..93635e40c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_int32.c index e3ff70ac41..17162dee38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_int64.c index 89a218544d..f0f40408f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_int8.c index 0fe4ec89f7..4aca83f2fa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint16.c index ee6845ed57..a12f47dc3e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint32.c index 9af0148536..0fe650177a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint64.c index 6930d1c363..0420f0b7c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint8.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint8.c index de7a8b7004..0502a709bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_second_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_second_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += b @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_second_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_second_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_second_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_secondj1_int32.c index 4751d21c4d..3ec406214a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_secondj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (j+1) @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_secondj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_secondj1_int32) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_secondj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_secondj1_int64.c index 72ef4e94b5..73e0610493 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_secondj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (j+1) @@ -68,7 +70,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -89,7 +91,7 @@ GrB_Info GB (_Adot2B__plus_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -112,7 +114,7 @@ GrB_Info GB (_Adot3B__plus_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__plus_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_Adot4B__plus_secondj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_secondj1_int64) ( @@ -176,7 +178,7 @@ GrB_Info GB (_AsaxbitB__plus_secondj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -237,7 +239,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -255,7 +257,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -347,8 +349,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -397,8 +399,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -449,8 +451,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_secondj_int32.c index d0ee5daadc..ed1d97a891 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_secondj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += j @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_secondj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_secondj_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_secondj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_secondj_int64.c index 17b535cee0..5713046a30 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_secondj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_secondj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_secondj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += j @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_secondj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_secondj_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_secondj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_fc32.c index c24e78d5fa..b5a98b8e9b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_mul (a,b) ; z = GB_FC32_add (z, x_op_y) ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__plus_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__plus_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__plus_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__plus_times_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_fc32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__plus_times_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_fc64.c index d6649efab8..1fa3c5fc9c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_mul (a,b) ; z = GB_FC64_add (z, x_op_y) ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_times_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_fc64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_times_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_fp32.c index 5a2bc79564..f2fa0f0bfc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a*b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_times_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_fp32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_times_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -275,7 +277,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -302,7 +304,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -320,7 +322,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -403,8 +405,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -412,8 +414,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -453,8 +455,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -462,8 +464,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -505,8 +507,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -514,8 +516,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_fp64.c index 9e2d2a6bde..40d1d7d2ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z += (a*b) @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__plus_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__plus_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__plus_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__plus_times_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_fp64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__plus_times_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -275,7 +277,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -302,7 +304,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -320,7 +322,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -403,8 +405,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -412,8 +414,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -453,8 +455,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -462,8 +464,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -505,8 +507,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -514,8 +516,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_int16.c index b10826c6f0..585a088f37 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_int16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_int32.c index 797c2cccc1..ec80e122be 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_int32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_int64.c index 6bfde5b37a..bc11ddf3e4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_int64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_int8.c index a801809d1b..eec7019605 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_int8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_int8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint16.c index 2beaf00403..ec883607ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_uint16) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint32.c index 5bc8dd7b72..a493e87537 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_uint32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint64.c index 5e7b1d600b..1a28d4ea62 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_uint64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint8.c index d09d13d2b3..c5a3a5acd2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__plus_times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__plus_times_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__plus_times_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a*b) ; z += x_op_y ; } @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__plus_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__plus_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__plus_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__plus_times_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__plus_times_uint8) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__plus_times_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__plus_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__plus_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_fc32.c index 5f24ee1528..83d7b398a8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_div (a,b) ; z = GB_FC32_mul (z, x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_div_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_div_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_fc64.c index 5959b9c201..6453026f04 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_div (a,b) ; z = GB_FC64_mul (z, x_op_y) ; } @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_div_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_div_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_fp32.c index 00458481f1..96445a2f14 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a/b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_div_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_div_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_fp64.c index 83a072e69e..419bc36594 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a/b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_div_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_div_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_div_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_int16.c index 33d51a476b..89e0ed82ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_div_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_div_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_int32.c index 524f9aa088..2c3ab224e3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_div_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_div_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_int64.c index a887891c54..992074a978 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_div_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_div_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_int8.c index eb06b6d853..5ced5aa65c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_div_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_div_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_div_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_uint16.c index b644fa70ba..5ebd917873 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_div_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_div_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_uint32.c index a0189dd904..0d22c99d4b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_div_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_div_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_uint64.c index 592208db00..a2b15e924d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_div_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_div_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_div_uint8.c index 00e4e8ca5d..fe0869254b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_div_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_div_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_div_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_div_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_div_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_div_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_fc32.c index 790917b69b..1ab5d4e4d9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC32_mul (z, a) @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__times_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__times_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__times_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__times_first_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_fc32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__times_first_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_fc64.c index 4d2a92a79e..f9538e3824 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC64_mul (z, a) @@ -60,7 +62,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -81,7 +83,7 @@ GrB_Info GB (_Adot2B__times_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -104,7 +106,7 @@ GrB_Info GB (_Adot3B__times_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -130,7 +132,7 @@ GrB_Info GB (_Adot4B__times_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_Adot4B__times_first_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_fc64) ( @@ -168,7 +170,7 @@ GrB_Info GB (_AsaxbitB__times_first_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -196,7 +198,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -247,7 +249,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -330,8 +332,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -339,8 +341,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -380,8 +382,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -389,8 +391,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -432,8 +434,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -441,8 +443,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_fp32.c index 79e8c3e1d0..640e104690 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__times_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__times_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__times_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__times_first_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_fp32) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__times_first_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_fp64.c index 1fb0428f5c..f3cc395e4e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -63,7 +65,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -84,7 +86,7 @@ GrB_Info GB (_Adot2B__times_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -107,7 +109,7 @@ GrB_Info GB (_Adot3B__times_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -133,7 +135,7 @@ GrB_Info GB (_Adot4B__times_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -142,7 +144,7 @@ GrB_Info GB (_Adot4B__times_first_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_fp64) ( @@ -171,7 +173,7 @@ GrB_Info GB (_AsaxbitB__times_first_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -250,7 +252,7 @@ GrB_Info GB (_Asaxpy4B__times_first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -333,8 +335,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -342,8 +344,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -383,8 +385,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -392,8 +394,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -435,8 +437,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -444,8 +446,8 @@ GrB_Info GB (_Asaxpy3B__times_first_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_int16.c index b9bb69189a..1634bd96b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_first_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_int16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_first_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_int32.c index b51b0b6e86..cd052f612b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_first_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_first_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_int64.c index 02e4395aae..2c5f162f9f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_first_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_int64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_first_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_int8.c index 3605644180..2584ab529e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_first_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_int8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_first_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_first_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_uint16.c index 7f5986c8d5..d5524ee1c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_first_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_uint16) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_first_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_uint32.c index c5ea184c76..4b5257ab99 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_first_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_uint32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_first_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_uint64.c index 4037fbcd95..a3919ebad0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_first_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_uint64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_first_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_first_uint8.c index dedfa2208c..84e0d053b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_first_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_first_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= a @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_first_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_first_uint8) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_first_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_first_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firsti1_int32.c index e549e56969..5c615eb74f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_firsti1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (i+1) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_firsti1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firsti1_int32) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_firsti1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firsti1_int64.c index d193ebbd30..137c7a4ce2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_firsti1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (i+1) @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_firsti1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firsti1_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_firsti1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firsti_int32.c index 048315c54f..dc3ee44043 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_firsti_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= i @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_firsti_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firsti_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_firsti_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firsti_int64.c index 303712abaf..51236a54f9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firsti_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firsti_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_firsti_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= i @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_firsti_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firsti_int64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_firsti_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_firsti_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_firsti_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firstj1_int32.c index 7911f6539c..0e8ac5e9c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_firstj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (k+1) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_firstj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firstj1_int32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_firstj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firstj1_int64.c index 2b12dd6641..e406eb0337 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_firstj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (k+1) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_firstj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firstj1_int64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_firstj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firstj_int32.c index bc0a0e354c..fdd58c0b2b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_firstj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= k @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_firstj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firstj_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_firstj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_firstj_int64.c index 3a598e7d9e..26e1cd8259 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_firstj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_firstj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_firstj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= k @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_firstj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_firstj_int64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_firstj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_firstj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_firstj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_fp32.c index 72188267d3..92824809a7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= fmaxf (a,b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_max_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_max_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_max_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_fp64.c index c6016f514e..3fbca9e927 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= fmax (a,b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_max_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_max_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_max_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_max_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_int16.c index cb69d74755..422b522b1e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_max_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_max_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_int32.c index 656c8f1b27..56752b8da7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_max_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_max_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_int64.c index 4681e23dbf..458558cbfc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_max_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_max_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_int8.c index 86c15f61cb..252c213d99 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_max_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_max_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_max_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_uint16.c index cb372bf2c8..59d59a7df9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_max_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_max_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_uint32.c index 3903ea7bf9..a9e7ad1997 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_max_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_max_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_uint64.c index fe3c018d1b..940abf3d89 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_max_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_max_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_max_uint8.c index 0284713238..b4b3d154cf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_max_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_max_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMAX (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_max_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_max_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_max_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_max_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_fp32.c index 50cb79d24e..e546d59a38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= fminf (a,b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_min_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_min_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_min_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_fp64.c index 09d20bef1d..caf95892ab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= fmin (a,b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_min_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_min_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_min_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_min_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_int16.c index f5830b9291..77483020c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_min_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_min_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_int32.c index d782a062ed..b8f997f7fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_min_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_min_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_int64.c index 1eefb8f8a5..31e6fd94d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_min_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_min_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_int8.c index 4cf8323a95..4902615e7b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_min_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_min_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_min_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_uint16.c index d64ec98704..1faf70326e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_min_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_min_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_uint32.c index 99ed4f1135..278b74caf7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_min_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_min_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_uint64.c index 2e9a50a2b0..a459bdc5e8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_min_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_min_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_min_uint8.c index a10b7363d0..24296904d5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_min_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_min_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_IMIN (a,b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_min_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_min_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_min_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_min_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_fc32.c index fe7b856356..842cd5d6c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_minus (a,b) ; z = GB_FC32_mul (z, x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_minus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_minus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_fc64.c index 1140b2743c..83814099f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_minus (a,b) ; z = GB_FC64_mul (z, x_op_y) ; } @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_minus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_minus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_fp32.c index 1f3392eac6..887fe1d65f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a-b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_minus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_minus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_fp64.c index 1d871bb839..00bda81c58 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a-b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_minus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_minus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_int16.c index 26c030c0a6..d101aeeb8d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_minus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_minus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_int32.c index 865487ba70..c4e6c7a630 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_minus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_minus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_int64.c index 92065368d0..738fe7baa2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_minus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_minus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_int8.c index 4e428b536e..e9ea26b5f4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_minus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_minus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint16.c index ed4d641621..c744b0a26d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_minus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_minus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint32.c index 19c42933db..3e3037b01a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_minus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_minus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint64.c index 6c1bf933b4..385401819d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_minus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_minus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint8.c index 9fe33ab6bf..f8803999f5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_minus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_minus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a-b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_minus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_minus_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_minus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_minus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_fc32.c index 1c3790c61d..2bb9af2ff0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_add (a,b) ; z = GB_FC32_mul (z, x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_plus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_plus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_fc64.c index 07291cde91..f462b3e69d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_add (a,b) ; z = GB_FC64_mul (z, x_op_y) ; } @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_plus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_plus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_fp32.c index 90299bc6a3..04f2e1a40a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a+b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_plus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_plus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_fp64.c index 6dc5fe2756..fc719c6ede 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a+b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_plus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_plus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_int16.c index d87bf30611..6e096e6569 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_plus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_plus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_int32.c index 56e41fef9c..6c4e12d433 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_plus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_plus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_int64.c index 32fc7cb80b..e223439171 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_plus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_plus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_int8.c index 8b4f029663..6c0a4db986 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_plus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_plus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint16.c index 5c96746d01..b996009be5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_plus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_plus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint32.c index 877237787c..41b83ffd74 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_plus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_plus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint64.c index 9324af9989..f6e101f9fa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_plus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_plus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint8.c index ec9164a8b3..90234d510e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_plus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_plus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a+b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_plus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_plus_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_plus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_plus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fc32.c index ed8ad42fed..ebb1551e34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_div (b,a) ; z = GB_FC32_mul (z, x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fc64.c index c7f24bf010..f7b83a5a8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_div (b,a) ; z = GB_FC64_mul (z, x_op_y) ; } @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fp32.c index 22ecbe3b26..d9d5f2ff22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (b/a) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fp64.c index d8b4bef9c7..5cacb7c957 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (b/a) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_rdiv_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int16.c index e13c9879a3..d3ccf51e25 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = GB_idiv_int16 (b, a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int32.c index 1be96aa980..79cc77cbfa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = GB_idiv_int32 (b, a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int64.c index 066b89038c..6ad75805e6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = GB_idiv_int64 (b, a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int8.c index 0fe9670f22..e6f5a9d221 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = GB_idiv_int8 (b, a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rdiv_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint16.c index 2ddb8a09d4..f054177160 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = GB_idiv_uint16 (b, a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint32.c index c310fa9cde..8282ff801a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = GB_idiv_uint32 (b, a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint64.c index 593e7913aa..993fc8a849 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = GB_idiv_uint64 (b, a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint8.c index 0a814f3dff..50666205ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rdiv_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_rdiv_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = GB_idiv_uint8 (b, a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rdiv_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rdiv_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rdiv_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rdiv_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fc32.c index b71a90f450..96388362a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_minus (b,a) ; z = GB_FC32_mul (z, x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_rminus_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fc64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fc64.c index 5a2a7c58d5..fd57aab9bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_minus (b,a) ; z = GB_FC64_mul (z, x_op_y) ; } @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_rminus_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fp32.c index ad64217d09..d41dd96a50 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (b-a) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_rminus_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fp64.c index 3a1917391f..e67c7f5ad0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (b-a) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_rminus_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int16.c index 37b086f8bb..1a0db0ddc9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rminus_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int32.c index 4ee642369b..f88547ba8c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rminus_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int64.c index a628da7b22..58bd61e7c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rminus_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int8.c index eec57df76b..f237f12888 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rminus_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint16.c index b2d579aca6..f90fdbacfd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint32.c index 611f23dad9..fe4febd26a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint64.c index b1a125cd36..c1694addd8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint8.c index c30ba8f581..0ba387902c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_rminus_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_rminus_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (b-a) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_rminus_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_rminus_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_rminus_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_rminus_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fc32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_fc32.c index b1ab39f699..b6d90e9ee4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC32_mul (z, b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_second_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_second_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_fc64.c index f96ad2aadc..7ecadb7805 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z = GB_FC64_mul (z, b) @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_second_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_second_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_fp32.c index af6db02880..3f6080534d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_second_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_second_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_fp64.c index 197432b784..2fda0ab4d3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_second_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_second_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_second_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_int16.c index 8af8e3b5f7..2ba373753e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_second_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_second_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_int32.c index 440aacde8d..15d902c2bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_second_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_second_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_int64.c index 80dbd93503..87d207dab6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_second_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_second_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_int8.c index 4e4825ce7f..c939c310ee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_second_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_second_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_second_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_uint16.c index 8aa41479eb..613572b064 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_second_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_second_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_uint32.c index 176fc66ca9..76a1921710 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_second_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_second_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_uint64.c index ba51dc47e7..5f5b1b1a38 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_second_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_second_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_second_uint8.c index b23d23f64a..bd0fb595b4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_second_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_second_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= b @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_second_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_second_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_second_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_second_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj1_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj1_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj1_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_secondj1_int32.c index 8ac3f13788..3b9340cd02 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj1_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj1_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_secondj1_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (j+1) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_secondj1_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_secondj1_int32) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_secondj1_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj1_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj1_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj1_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj1_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj1_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_secondj1_int64.c index 7211181e0f..04d9f05cda 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj1_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj1_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_secondj1_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (j+1) @@ -67,7 +69,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -88,7 +90,7 @@ GrB_Info GB (_Adot2B__times_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -111,7 +113,7 @@ GrB_Info GB (_Adot3B__times_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -137,7 +139,7 @@ GrB_Info GB (_Adot4B__times_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -146,7 +148,7 @@ GrB_Info GB (_Adot4B__times_secondj1_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_secondj1_int64) ( @@ -175,7 +177,7 @@ GrB_Info GB (_AsaxbitB__times_secondj1_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -203,7 +205,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -236,7 +238,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj1_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -254,7 +256,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj1_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -337,8 +339,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -346,8 +348,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -387,8 +389,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -396,8 +398,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -439,8 +441,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -448,8 +450,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj1_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_secondj_int32.c index 1ca575ceae..5961c12a66 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_secondj_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= j @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_secondj_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_secondj_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_secondj_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_secondj_int64.c index f5ff75a589..f187fb76a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_secondj_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_secondj_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_secondj_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= j @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_secondj_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_secondj_int64) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_secondj_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_secondj_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_secondj_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fc32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fc32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fc32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_fc32.c index 34c9c4584b..7210ccb2d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fc32.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_fc32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC32_t x_op_y = GB_FC32_mul (a,b) ; z = GB_FC32_mul (z, x_op_y) ; } @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_times_fc32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_fc32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_times_fc32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fc32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fc64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fc64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fc64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_fc64.c index 1d5111ceec..179bb61cb8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fc64.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_fc64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { GxB_FC64_t x_op_y = GB_FC64_mul (a,b) ; z = GB_FC64_mul (z, x_op_y) ; } @@ -59,7 +61,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -80,7 +82,7 @@ GrB_Info GB (_Adot2B__times_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -103,7 +105,7 @@ GrB_Info GB (_Adot3B__times_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -129,7 +131,7 @@ GrB_Info GB (_Adot4B__times_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_Adot4B__times_times_fc64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_fc64) ( @@ -167,7 +169,7 @@ GrB_Info GB (_AsaxbitB__times_times_fc64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -195,7 +197,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -228,7 +230,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fc64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -246,7 +248,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -329,8 +331,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -338,8 +340,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -379,8 +381,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -388,8 +390,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -431,8 +433,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -440,8 +442,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fc64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fp32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fp32.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fp32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_fp32.c index 869e6446e1..62f1ba6d4b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fp32.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_fp32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a*b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_times_fp32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_fp32) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_times_fp32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fp32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fp64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fp64.c similarity index 89% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fp64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_fp64.c index f41919e919..24f7c6db90 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_fp64.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_fp64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) z *= (a*b) @@ -62,7 +64,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -83,7 +85,7 @@ GrB_Info GB (_Adot2B__times_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -106,7 +108,7 @@ GrB_Info GB (_Adot3B__times_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -132,7 +134,7 @@ GrB_Info GB (_Adot4B__times_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_Adot4B__times_times_fp64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_fp64) ( @@ -170,7 +172,7 @@ GrB_Info GB (_AsaxbitB__times_times_fp64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -198,7 +200,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -231,7 +233,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fp64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -249,7 +251,7 @@ GrB_Info GB (_Asaxpy4B__times_times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -332,8 +334,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -341,8 +343,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -382,8 +384,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -391,8 +393,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -434,8 +436,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -443,8 +445,8 @@ GrB_Info GB (_Asaxpy3B__times_times_fp64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_int16.c index ba0efbd14c..4e159bb82d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int16.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_int16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int16_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_times_int16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_int16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_times_int16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_int32.c index b28bbf4c41..5b273059bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int32.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_int32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int32_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_times_int32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_int32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_times_int32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_int64.c index 26b84a529a..b9db74cfc5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int64.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_int64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int64_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_times_int64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_int64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_times_int64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_int8.c index fb39921cdc..3b96d4d4e3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_int8.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_int8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { int8_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_times_int8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_int8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_times_int8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_times_int8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint16.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint16.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_uint16.c index 1a36df0d86..a7454c230c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint16.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_uint16.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint16_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_times_uint16) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_uint16) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_times_uint16) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint16) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint16) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint16) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint16) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint32.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint32.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_uint32.c index 1b4b838483..c0b3b2a2b6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint32.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_uint32.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint32_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -65,7 +67,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -86,7 +88,7 @@ GrB_Info GB (_Adot2B__times_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -109,7 +111,7 @@ GrB_Info GB (_Adot3B__times_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -135,7 +137,7 @@ GrB_Info GB (_Adot4B__times_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -144,7 +146,7 @@ GrB_Info GB (_Adot4B__times_times_uint32) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_uint32) ( @@ -173,7 +175,7 @@ GrB_Info GB (_AsaxbitB__times_times_uint32) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -234,7 +236,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint32) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -252,7 +254,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -335,8 +337,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -344,8 +346,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -385,8 +387,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -394,8 +396,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint32) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -437,8 +439,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint32) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -446,8 +448,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint32) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint64.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint64.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_uint64.c index b517b041a6..8d5ff0f959 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint64.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_uint64.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint64_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_times_uint64) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_uint64) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_times_uint64) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint64) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint64) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint64) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint64) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint8.c b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint8.c rename to GraphBLAS/FactoryKernels/GB_AxB__times_times_uint8.c index c784525270..2054c9d61c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_AxB__times_times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_AxB__times_times_uint8.c @@ -2,15 +2,17 @@ // GB_AxB__times_times_uint8.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include2.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_AxB__include2.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) { uint8_t x_op_y = (a*b) ; z *= x_op_y ; } @@ -66,7 +68,7 @@ #define GB_DISABLE 0 #endif -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -87,7 +89,7 @@ GrB_Info GB (_Adot2B__times_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -110,7 +112,7 @@ GrB_Info GB (_Adot3B__times_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -136,7 +138,7 @@ GrB_Info GB (_Adot4B__times_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_Adot4B__times_times_uint8) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__times_times_uint8) ( @@ -174,7 +176,7 @@ GrB_Info GB (_AsaxbitB__times_times_uint8) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -202,7 +204,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -235,7 +237,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint8) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -253,7 +255,7 @@ GrB_Info GB (_Asaxpy4B__times_times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -336,8 +338,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -345,8 +347,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -386,8 +388,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -395,8 +397,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint8) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -438,8 +440,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint8) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -447,8 +449,8 @@ GrB_Info GB (_Asaxpy3B__times_times_uint8) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__atan2_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__atan2_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__atan2_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__atan2_fp32.c index 35121f0a8f..bcf72728f9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__atan2_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__atan2_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = atan2f (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__atan2_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__atan2_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__atan2_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__atan2_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__atan2_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__atan2_fp64.c index dab6b0e7ae..2053220827 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__atan2_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__atan2_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = atan2 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__atan2_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__atan2_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int16.c b/GraphBLAS/FactoryKernels/GB_aop__band_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__band_int16.c index 2d7b640d8c..1c7c9a7f49 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int32.c b/GraphBLAS/FactoryKernels/GB_aop__band_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__band_int32.c index 7826b9f4ec..12b7652482 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int64.c b/GraphBLAS/FactoryKernels/GB_aop__band_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__band_int64.c index 02c773203f..60c72dda70 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int8.c b/GraphBLAS/FactoryKernels/GB_aop__band_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__band_int8.c index a8ff74a6ff..e61c791a13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__band_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__band_uint16.c index e2d6a49b4c..07b37b3af7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__band_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__band_uint32.c index 1f9b07c0bd..c3da36b797 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__band_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__band_uint64.c index 7c4dc5c6d6..5d86021e0d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__band_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__band_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__band_uint8.c index d9f6ef1368..8a1aefe377 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__band_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__band_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) & (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__band_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__band_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_int16.c index 5b112e0fe6..f6a4db123e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_int16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_int32.c index e309d5ec13..3a486a5ad7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_int32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_int64.c index cd109a8d88..8c863fc841 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_int64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_int8.c index 9083bb80a1..6e036db5e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_int8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_uint16.c index 258c66a76e..3b81c31d9c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_uint16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_uint32.c index 188e2801ce..e7ae5f4d41 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_uint32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_uint64.c index cc14cc4932..8ec9031b0a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_uint64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bclr_uint8.c index 984df5f58b..21a4beffa1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bclr_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bclr_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitclr_uint8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bclr_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bclr_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bget_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_int16.c index b1515b47a6..ff7e1363b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_int16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bget_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_int32.c index d1438c1ddd..1cece1a1c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_int32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bget_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_int64.c index 3316794428..73b163a135 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_int64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bget_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_int8.c index 2fbddfd77b..c249d8103c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_int8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bget_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_uint16.c index d3470f627e..a2d3306084 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_uint16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bget_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_uint32.c index 980abf3d63..f821cea7dc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_uint32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bget_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_uint64.c index 03f3fdebcd..cf96706f00 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_uint64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bget_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bget_uint8.c index 7ee90325c4..13f6864e31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bget_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bget_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitget_uint8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bget_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bget_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_int16.c index 47613e1af1..a8731a6af9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_int32.c index d0b8856788..90bc5d1835 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_int64.c index 2c9e5f1140..33eea55dc7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_int8.c index 14aab19449..fcf7bfc070 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_uint16.c index 96ddd1b10a..f2ec560247 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_uint32.c index 79dfafb053..cc794925a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_uint64.c index 07ea62d6cc..1b54d5057f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bor_uint8.c index 98c8c32f19..f5a9e62164 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bor_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) | (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bor_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bor_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bset_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_int16.c index 8f5b26a368..891c932a71 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_int16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bset_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_int32.c index 65c485844d..c73fc03a2e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_int32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bset_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_int64.c index 1850a86c3f..a56ee6d259 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_int64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bset_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_int8.c index 1169582c2d..4a297a3f53 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_int8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bset_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_uint16.c index 36b731f966..546bc9839e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_uint16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bset_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_uint32.c index e7d57c57d4..eeed92a787 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_uint32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bset_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_uint64.c index 71370a83b4..3e37ac3ad0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_uint64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bset_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bset_uint8.c index d32f1a1732..91e81f1a46 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bset_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bset_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitset_uint8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bset_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bset_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_int16.c index 66c8319602..34d9c89330 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_int16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_int32.c index d8419efbd3..16e912339d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_int32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_int64.c index b4f1fd5e0a..a1b3824ea1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_int64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_int8.c index 8761e630c7..972990c7f8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_int8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_uint16.c index f68b099217..9c37ef26b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_uint16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_uint32.c index 57cff9a4a0..fe6605bd11 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_uint32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_uint64.c index eaa1d6de9f..b7d80fabd2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_uint64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bshift_uint8.c index 6b376549be..bd6684b943 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bshift_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bshift_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_bitshift_uint8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bshift_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bshift_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_int16.c index 9e5b1efd63..f1e8b670b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_int32.c index 84daf026b7..5f3ceac42a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_int64.c index 83037ff7ed..101dded6f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_int8.c index f46ecc2ca6..60a7da20fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_uint16.c index cfd89bdc64..f2bfe39291 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_uint32.c index 5de185f340..2a8f6a02d0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_uint64.c index a1e1279254..a162526309 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bxnor_uint8.c index 9095a73a31..7f54faf52e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxnor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxnor_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ~((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxnor_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxnor_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int16.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_int16.c index 715f81b363..ced1033c06 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int32.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_int32.c index 825804b770..273e7259d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int64.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_int64.c index 8c3a6b661d..f4d312da1b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int8.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_int8.c index 0d8483b8e7..a8ea722ece 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_uint16.c index 4345f66a71..22cdb70b9b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_uint32.c index b9bba22a2a..bceb6d8d1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_uint64.c index 705f7b67dc..7498e609cf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__bxor_uint8.c index c0eaaff146..045c8371de 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__bxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__bxor_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) ^ (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__bxor_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__bxor_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__cmplx_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__cmplx_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__cmplx_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__cmplx_fp32.c index d7f2c9f34f..a9496a0efe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__cmplx_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__cmplx_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GJ_CMPLX32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__cmplx_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__cmplx_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__cmplx_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__cmplx_fp64.c index 201a13b0ed..ceaf0e1394 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__cmplx_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__cmplx_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GJ_CMPLX64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__copysign_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__copysign_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__copysign_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__copysign_fp32.c index 23ecb2a367..1a2ced72e2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__copysign_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__copysign_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = copysignf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__copysign_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__copysign_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__copysign_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__copysign_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__copysign_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__copysign_fp64.c index 9122a7e1f2..1439fcbae2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__copysign_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__copysign_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = copysign (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__copysign_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__copysign_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__div_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__div_fc32.c index 7b91e9d15a..4698b1dd79 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_div (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__div_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__div_fc64.c index 7c1f427e25..a3d27c1989 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_div (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__div_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__div_fp32.c index 68e86e984f..0947d672ad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) / (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__div_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__div_fp64.c index 9a8bdcb944..907b80e87b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) / (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int16.c b/GraphBLAS/FactoryKernels/GB_aop__div_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__div_int16.c index c9448ea5c2..f902dfe864 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int32.c b/GraphBLAS/FactoryKernels/GB_aop__div_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__div_int32.c index 32d84346f2..02e3ac2c6b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int64.c b/GraphBLAS/FactoryKernels/GB_aop__div_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__div_int64.c index 1ec84d25e5..7c02976919 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int8.c b/GraphBLAS/FactoryKernels/GB_aop__div_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__div_int8.c index 23f9e55118..675ef3e13a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__div_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__div_uint16.c index aedb48377b..942437e36f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__div_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__div_uint32.c index 80f43921f9..f9ddc7eae9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__div_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__div_uint64.c index 6f635f6d14..d90d4db2b9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__div_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__div_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__div_uint8.c index 56d674017c..0236159ee3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__div_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__div_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__div_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_bool.c b/GraphBLAS/FactoryKernels/GB_aop__eq_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_bool.c index 689ac53606..11015b1465 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__eq_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__eq_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__eq_fc32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_fc32.c index 6526159e9f..5bbaf2d1de 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_eq (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__eq_fc64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_fc64.c index 82e25f6cdd..390f2caab5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_eq (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__eq_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_fp32.c index 2c8f99dda8..0914ee1a3f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__eq_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_fp64.c index fd69ed43a9..03b6c1abf7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int16.c b/GraphBLAS/FactoryKernels/GB_aop__eq_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_int16.c index ff70da0d38..7c0b884304 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int32.c b/GraphBLAS/FactoryKernels/GB_aop__eq_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_int32.c index 46cc788ee8..33303f99d5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int64.c b/GraphBLAS/FactoryKernels/GB_aop__eq_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_int64.c index 0ec4de66be..19c5fe9ecb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int8.c b/GraphBLAS/FactoryKernels/GB_aop__eq_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_int8.c index c3747e03e3..7d48479027 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__eq_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_uint16.c index cf5541cdce..e227ccd0f4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__eq_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_uint32.c index 108eb6215a..30c74a3765 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__eq_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_uint64.c index 0235ce41fc..1f149503da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__eq_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__eq_uint8.c index 2210829f72..f5dace97c2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__eq_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_bool.c b/GraphBLAS/FactoryKernels/GB_aop__first_bool.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__first_bool.c index 921e644036..6972213a0d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__first_fc32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__first_fc32.c index 06031959d4..3d880bf1c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__first_fc64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__first_fc64.c index d6868776ed..47a03e2a14 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__first_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__first_fp32.c index bd5c012351..ea98103650 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__first_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__first_fp64.c index 33a91f8245..523cdbcfcd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int16.c b/GraphBLAS/FactoryKernels/GB_aop__first_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__first_int16.c index 9dfaa417d1..77332b6371 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int32.c b/GraphBLAS/FactoryKernels/GB_aop__first_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__first_int32.c index d78d328d2a..3dd3a299ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int64.c b/GraphBLAS/FactoryKernels/GB_aop__first_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__first_int64.c index fae2b3cd7a..e9a5b4a0b6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int8.c b/GraphBLAS/FactoryKernels/GB_aop__first_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__first_int8.c index 6d8f8f0b7c..ded500bf9a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__first_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__first_uint16.c index 5c2ba79923..22d9712fcf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__first_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__first_uint32.c index e9ef30dfb2..911c915a0e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__first_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__first_uint64.c index 78f2589d04..37e9c9f760 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__first_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__first_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__first_uint8.c index c7c31df41e..d5ce37c36b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__first_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = x @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__fmod_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__fmod_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__fmod_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__fmod_fp32.c index ba38f8c9bb..e98ebe593c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__fmod_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__fmod_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = fmodf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__fmod_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__fmod_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__fmod_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__fmod_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__fmod_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__fmod_fp64.c index a59da27233..882596df24 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__fmod_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__fmod_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = fmod (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__fmod_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__fmod_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_bool.c b/GraphBLAS/FactoryKernels/GB_aop__ge_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_bool.c index 832b7d676a..c5dbae8b6b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__ge_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__ge_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__ge_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_fp32.c index dd5f2302ad..e9cd0ea9c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__ge_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_fp64.c index 5f819e7e39..43a482184a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int16.c b/GraphBLAS/FactoryKernels/GB_aop__ge_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_int16.c index 3198e9eec4..4162db929d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int32.c b/GraphBLAS/FactoryKernels/GB_aop__ge_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_int32.c index 96e7ceb237..eeb37db9fa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int64.c b/GraphBLAS/FactoryKernels/GB_aop__ge_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_int64.c index 7cd6855e6d..763ecc6ee1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int8.c b/GraphBLAS/FactoryKernels/GB_aop__ge_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_int8.c index c2f68743c0..0cd0f79bfc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__ge_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_uint16.c index caae3d152c..2ddda083bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__ge_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_uint32.c index 072b434116..c4580390f7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__ge_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_uint64.c index 045cbe62f4..d0e416c703 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__ge_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__ge_uint8.c index d42597953d..4daadad86e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ge_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_bool.c b/GraphBLAS/FactoryKernels/GB_aop__gt_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_bool.c index 2876737015..8f17249981 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__gt_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__gt_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__gt_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_fp32.c index 7a073cb562..129342ef48 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__gt_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_fp64.c index a43ef44aec..b2609496ba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int16.c b/GraphBLAS/FactoryKernels/GB_aop__gt_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_int16.c index 69ee259575..39c76b4189 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int32.c b/GraphBLAS/FactoryKernels/GB_aop__gt_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_int32.c index 86e672f8e2..7d33575a5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int64.c b/GraphBLAS/FactoryKernels/GB_aop__gt_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_int64.c index 86e579ee6a..1229de380e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int8.c b/GraphBLAS/FactoryKernels/GB_aop__gt_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_int8.c index 77b9a0014c..2483ab2226 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__gt_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_uint16.c index 5857c99e36..c8c2579b2d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__gt_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_uint32.c index c7063ac600..0dabebbebc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__gt_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_uint64.c index fc89cead95..56daf0c111 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__gt_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__gt_uint8.c index 9fc516bcea..ede40cb753 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__gt_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__hypot_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__hypot_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__hypot_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__hypot_fp32.c index 8aac821869..c4310281d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__hypot_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__hypot_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = hypotf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__hypot_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__hypot_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__hypot_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__hypot_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__hypot_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__hypot_fp64.c index 8cbed6327a..c22c2e41f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__hypot_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__hypot_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = hypot (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__hypot_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__hypot_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__include.h b/GraphBLAS/FactoryKernels/GB_aop__include.h similarity index 99% rename from GraphBLAS/Source/FactoryKernels/GB_aop__include.h rename to GraphBLAS/FactoryKernels/GB_aop__include.h index ee91742be7..ea3e6f62c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__include.h +++ b/GraphBLAS/FactoryKernels/GB_aop__include.h @@ -2,11 +2,11 @@ // GB_aop__include.h: definitions for GB_aop__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_aop.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_subassign_23__first_bool) ( diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_fc32.c index dd6d614efc..547406d61b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_iseq (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_fc64.c index 2b1cd201e3..68ecdf808f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_iseq (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_fp32.c index a56f764fb2..743603a4ea 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_fp64.c index 2540312b6e..b81924bb59 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int16.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_int16.c index b35fcbaeb0..f31178c496 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int32.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_int32.c index c5813e689d..98588fe1d5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int64.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_int64.c index 840b044735..fe61410cde 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int8.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_int8.c index db098cb3ce..0fd0c65f79 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_uint16.c index 190f5a7cbe..51f90f78dc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_uint32.c index 24d4edb8e7..131f47b133 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_uint64.c index 811fd6ec64..749558763d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__iseq_uint8.c index b050a5a21e..8d918ac527 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__iseq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__iseq_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) == (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__iseq_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__iseq_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__isge_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_fp32.c index 9a89c3c773..4f103459c9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__isge_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_fp64.c index 2a50670cc6..de334a1c1b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int16.c b/GraphBLAS/FactoryKernels/GB_aop__isge_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_int16.c index cff5ce483b..99affc9e9a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int32.c b/GraphBLAS/FactoryKernels/GB_aop__isge_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_int32.c index 5dcf491486..0f45202947 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int64.c b/GraphBLAS/FactoryKernels/GB_aop__isge_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_int64.c index 556c678bf8..23fe326e0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int8.c b/GraphBLAS/FactoryKernels/GB_aop__isge_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_int8.c index 34e07620d1..7d7ba26db3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__isge_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_uint16.c index 2af6b43f6d..12192ab077 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__isge_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_uint32.c index 256b725c7f..9db6ce1f69 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__isge_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_uint64.c index e8bfbbc65b..71c7765962 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__isge_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__isge_uint8.c index d300cb3a24..993e1229bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isge_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) >= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isge_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isge_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_fp32.c index f06c0a259a..43cef1689c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_fp64.c index 7bed584b43..0b6aaa6a6e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int16.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_int16.c index 8e10dbbd51..94603b91ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int32.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_int32.c index 3e8ab49348..b5e069b5ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int64.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_int64.c index 03faa7ba27..c8b385bad8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int8.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_int8.c index bd1eb6bce1..fc5de66922 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_uint16.c index f308df36a1..6f95ef4fbe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_uint32.c index 97e2b098ce..d9de73df6b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_uint64.c index 3fe9c7dd00..751887559c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__isgt_uint8.c index 5661dcf890..8899b92a45 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isgt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isgt_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) > (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isgt_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isgt_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__isle_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_fp32.c index 738f731720..c6e58b8585 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__isle_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_fp64.c index fe96c9c977..d54c404d94 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int16.c b/GraphBLAS/FactoryKernels/GB_aop__isle_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_int16.c index e8e0bba897..55ac73516e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int32.c b/GraphBLAS/FactoryKernels/GB_aop__isle_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_int32.c index 508f08ea97..b22b057a90 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int64.c b/GraphBLAS/FactoryKernels/GB_aop__isle_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_int64.c index 2dbcb55c8b..86803d2a4e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int8.c b/GraphBLAS/FactoryKernels/GB_aop__isle_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_int8.c index 3a72c4d7b4..ebad555a15 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__isle_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_uint16.c index 44814ddd9e..b950324a9a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__isle_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_uint32.c index f187ee03d4..601ef8a632 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__isle_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_uint64.c index 8aa8e1bf5b..9ecfa54a2b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__isle_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__isle_uint8.c index 3cae817826..ba40df9213 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isle_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isle_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isle_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isle_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__islt_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_fp32.c index c3488902ca..d5f011b2a3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__islt_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_fp64.c index 0fd7a7a25d..53f6686dbf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int16.c b/GraphBLAS/FactoryKernels/GB_aop__islt_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_int16.c index cd2e058ffc..f769fe0161 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int32.c b/GraphBLAS/FactoryKernels/GB_aop__islt_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_int32.c index af7bc70fb4..3ca89ffd0e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int64.c b/GraphBLAS/FactoryKernels/GB_aop__islt_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_int64.c index f1d1232eff..00c30c13d1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int8.c b/GraphBLAS/FactoryKernels/GB_aop__islt_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_int8.c index 5d0237342b..afbe27fd16 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__islt_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_uint16.c index 5483166a90..206ee446fe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__islt_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_uint32.c index a5af7fdd22..8739c7707f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__islt_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_uint64.c index 3cf407f390..6c630f4fd7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__islt_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__islt_uint8.c index 4893445ab2..8381fd86f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__islt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__islt_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__islt_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__islt_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__isne_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_fc32.c index 7c222d8599..716c771b99 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_isne (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__isne_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_fc64.c index e1ab1bda79..d9c0482b07 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_isne (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__isne_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_fp32.c index 823b388959..c6a160137a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__isne_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_fp64.c index e87b62fed5..c640c4337b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int16.c b/GraphBLAS/FactoryKernels/GB_aop__isne_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_int16.c index ac6a9f8aab..1964b36cad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int32.c b/GraphBLAS/FactoryKernels/GB_aop__isne_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_int32.c index 49bb217046..139566e39a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int64.c b/GraphBLAS/FactoryKernels/GB_aop__isne_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_int64.c index dfe712a403..56e96a3d19 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int8.c b/GraphBLAS/FactoryKernels/GB_aop__isne_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_int8.c index 4abc921aa4..1a69f68385 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__isne_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_uint16.c index 79061dfefe..fff57985ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__isne_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_uint32.c index bd495ffd6b..0661d2083c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__isne_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_uint64.c index a94bb5274f..95638c7248 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__isne_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__isne_uint8.c index 1288128a1a..09225e4399 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__isne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__isne_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__isne_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__isne_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_bool.c b/GraphBLAS/FactoryKernels/GB_aop__land_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__land_bool.c index cdaf848e44..b53654c426 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) && (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__land_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__land_fp32.c index 2db5a8e24f..2894adb227 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__land_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__land_fp64.c index a38a6f62f2..d68068cc33 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int16.c b/GraphBLAS/FactoryKernels/GB_aop__land_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__land_int16.c index 546292fc7d..8cf4e44424 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int32.c b/GraphBLAS/FactoryKernels/GB_aop__land_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__land_int32.c index d2e8e997bd..18d8a62fd2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int64.c b/GraphBLAS/FactoryKernels/GB_aop__land_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__land_int64.c index 9bafd7cd5a..219b75e8c2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int8.c b/GraphBLAS/FactoryKernels/GB_aop__land_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__land_int8.c index 6149843ec0..e061b058b7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__land_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__land_uint16.c index 6b2f258c0e..91eb076e93 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__land_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__land_uint32.c index 5452311e67..b894092b89 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__land_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__land_uint64.c index 256a0aa5d7..dd48459b1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__land_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__land_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__land_uint8.c index aba8df6378..9b931e8127 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__land_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__land_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) && ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__land_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__land_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ldexp_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__ldexp_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ldexp_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__ldexp_fp32.c index adf0193aa3..566a374413 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ldexp_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ldexp_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ldexpf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__ldexp_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__ldexp_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ldexp_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__ldexp_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ldexp_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__ldexp_fp64.c index 501df89d23..841ef5e9bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ldexp_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ldexp_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ldexp (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__ldexp_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__ldexp_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_bool.c b/GraphBLAS/FactoryKernels/GB_aop__le_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__le_bool.c index 0d1ec07e45..7c02ed30bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__le_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__le_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__le_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__le_fp32.c index 6a29ecc692..6a213ea4bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__le_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__le_fp64.c index c50fd11446..47b9da249f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int16.c b/GraphBLAS/FactoryKernels/GB_aop__le_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__le_int16.c index dd6eb8cbcd..056b40384f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int32.c b/GraphBLAS/FactoryKernels/GB_aop__le_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__le_int32.c index 15651055d7..be51d60225 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int64.c b/GraphBLAS/FactoryKernels/GB_aop__le_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__le_int64.c index a8975fd73e..2716d3fd0d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int8.c b/GraphBLAS/FactoryKernels/GB_aop__le_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__le_int8.c index c6f275d84e..17a2e7374e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__le_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__le_uint16.c index 83dccf0143..e75ee4aad0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__le_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__le_uint32.c index 940cfd4557..9480e63046 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__le_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__le_uint64.c index affc9ddc35..f4465b25d6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__le_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__le_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__le_uint8.c index 36b86afbc0..4dd2579161 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__le_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) <= (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_bool.c b/GraphBLAS/FactoryKernels/GB_aop__lor_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_bool.c index 1a7f162777..60f4a689a6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) || (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__lor_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_fp32.c index 1536135260..139a2824bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__lor_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_fp64.c index 538a5950d5..86e8673723 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int16.c b/GraphBLAS/FactoryKernels/GB_aop__lor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_int16.c index 8080364a10..91039f5dc4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int32.c b/GraphBLAS/FactoryKernels/GB_aop__lor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_int32.c index 74ba738089..2cf2cd48bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int64.c b/GraphBLAS/FactoryKernels/GB_aop__lor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_int64.c index 3c50525ddb..b916696b2d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int8.c b/GraphBLAS/FactoryKernels/GB_aop__lor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_int8.c index 4c1de2c044..39c5455032 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__lor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_uint16.c index dd0010b4a0..68a2a60857 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__lor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_uint32.c index 4d561068cf..c689e6ead0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__lor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_uint64.c index 3caa7ff5e8..ce72fc82bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__lor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__lor_uint8.c index e4bd37048b..051ea8df8d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lor_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) || ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lor_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lor_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_bool.c b/GraphBLAS/FactoryKernels/GB_aop__lt_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_bool.c index 656ac26432..6655adaa69 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lt_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lt_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__lt_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_fp32.c index f748cd722d..c3a0a3046b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__lt_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_fp64.c index a010de85b5..9a368f9150 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int16.c b/GraphBLAS/FactoryKernels/GB_aop__lt_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_int16.c index b605c026fe..6a8efb9f75 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int32.c b/GraphBLAS/FactoryKernels/GB_aop__lt_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_int32.c index 399dca2a6b..6daa92ec4a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int64.c b/GraphBLAS/FactoryKernels/GB_aop__lt_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_int64.c index 2afca7dd78..4dbdc58602 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int8.c b/GraphBLAS/FactoryKernels/GB_aop__lt_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_int8.c index fb94847460..41d1958a96 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__lt_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_uint16.c index 51c14735e4..374d88a61b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__lt_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_uint32.c index cbbf1203f8..946363efa1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__lt_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_uint64.c index 55e6488146..6e76fed5dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__lt_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__lt_uint8.c index a43c410f19..1db205f37b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lt_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) < (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_bool.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_bool.c index a90f0cb3d5..eb4edec14e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_fp32.c index af3f487bcd..e5151011b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_fp64.c index 328aa9a1ef..bd565a598b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int16.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_int16.c index 0184fff6ea..d47417fd58 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int32.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_int32.c index 52fad9a382..2e34f5f068 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int64.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_int64.c index 5e7fc21b84..a9e5ee283a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int8.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_int8.c index b4ed2b1538..af8d9df568 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_uint16.c index b174ce85eb..8c13b537a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_uint32.c index 304c6dbcc5..d99026587b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_uint64.c index 10d1e4cc7a..f97874b5e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__lxor_uint8.c index 84719af7f0..72792fa596 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__lxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__lxor_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (((x) != 0) != ((y) != 0)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__lxor_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__lxor_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__max_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__max_fp32.c index 0016074cd1..db69b17052 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = fmaxf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__max_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__max_fp64.c index e7803fe590..59642b038f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = fmax (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int16.c b/GraphBLAS/FactoryKernels/GB_aop__max_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__max_int16.c index b0a0d44ac1..2ec602478c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int32.c b/GraphBLAS/FactoryKernels/GB_aop__max_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__max_int32.c index 92d95083f2..b2904a4043 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int64.c b/GraphBLAS/FactoryKernels/GB_aop__max_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__max_int64.c index d16965a8a1..84ea3160cd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int8.c b/GraphBLAS/FactoryKernels/GB_aop__max_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__max_int8.c index 47754affbc..7d02f7642e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__max_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__max_uint16.c index 5acf1d2f2b..4acf2d77ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__max_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__max_uint32.c index dec48bb9db..94f89bb725 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__max_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__max_uint64.c index 8332175957..c2da3b9ee7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__max_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__max_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__max_uint8.c index 222952a487..304b0732f8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__max_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMAX (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__max_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__max_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__min_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__min_fp32.c index 1477052ece..f065fe45ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = fminf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__min_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__min_fp64.c index b28fb92077..91d26e607d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = fmin (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int16.c b/GraphBLAS/FactoryKernels/GB_aop__min_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__min_int16.c index 1ffc4e03d3..12edcf25dc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int32.c b/GraphBLAS/FactoryKernels/GB_aop__min_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__min_int32.c index 3666f1c157..6570c336dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int64.c b/GraphBLAS/FactoryKernels/GB_aop__min_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__min_int64.c index 0f20fa7bc7..61c5bc4e26 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int8.c b/GraphBLAS/FactoryKernels/GB_aop__min_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__min_int8.c index a113de3cc7..fe11947e08 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__min_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__min_uint16.c index 5fc5d3aec2..ee70a53ab4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__min_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__min_uint32.c index a79874395c..4ca975923c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__min_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__min_uint64.c index 9398716eda..83a53a5585 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__min_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__min_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__min_uint8.c index b4f1392eb9..5da4d38290 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__min_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_IMIN (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__min_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__min_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__minus_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_fc32.c index f4ba1154b8..737234872d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_minus (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__minus_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_fc64.c index 576d3eda41..3d6c6a08cf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_minus (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__minus_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_fp32.c index ed9b1f77f0..eca435deab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__minus_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_fp64.c index 44835979d2..3fb3c7f85b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int16.c b/GraphBLAS/FactoryKernels/GB_aop__minus_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_int16.c index 8453a4b226..9e20c99ddb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int32.c b/GraphBLAS/FactoryKernels/GB_aop__minus_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_int32.c index 866fcee0e5..4a7b2357a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int64.c b/GraphBLAS/FactoryKernels/GB_aop__minus_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_int64.c index f419718022..ea105c6c39 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int8.c b/GraphBLAS/FactoryKernels/GB_aop__minus_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_int8.c index 36cf1f496a..68a23ea2d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__minus_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_uint16.c index a5cd573005..1cd7733a72 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__minus_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_uint32.c index e946b27e57..cfd9ccda0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__minus_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_uint64.c index f7775fe9ad..c9f9ab9dad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__minus_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__minus_uint8.c index aff578a7c4..aed82f7104 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__minus_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) - (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__minus_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__minus_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__ne_fc32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_fc32.c index bd213f2508..f46aec5053 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_ne (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__ne_fc64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_fc64.c index 20d4304d7f..4854a52f67 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_ne (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__ne_fp32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_fp32.c index 40be4cdd27..7e3c9ae923 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__ne_fp64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_fp64.c index dff659582a..97030fbdde 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int16.c b/GraphBLAS/FactoryKernels/GB_aop__ne_int16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_int16.c index 27a55f54f9..bd2f2286d0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int32.c b/GraphBLAS/FactoryKernels/GB_aop__ne_int32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_int32.c index 45b95c4f5d..14ea94e8b6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int64.c b/GraphBLAS/FactoryKernels/GB_aop__ne_int64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_int64.c index e26873b8ef..4d41177ea5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int8.c b/GraphBLAS/FactoryKernels/GB_aop__ne_int8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_int8.c index 4754a30a16..c34f079cab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__ne_uint16.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_uint16.c index c01d5a6d33..cb0c36f018 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__ne_uint32.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_uint32.c index 1675e3fe0f..4ac51a223a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__ne_uint64.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_uint64.c index f52d4a84eb..9933d3f409 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__ne_uint8.c similarity index 93% rename from GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__ne_uint8.c index f6bdaf6898..457c13b01c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__ne_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = ((x) != (y)) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_bool.c b/GraphBLAS/FactoryKernels/GB_aop__pair_bool.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_bool.c index 9a69a36f28..aa82331942 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__pair_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_fc32.c index 5460adecf1..112345eecd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GxB_CMPLXF(1,0) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__pair_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_fc64.c index 671fe3a654..04321a2f3b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GxB_CMPLX(1,0) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__pair_fp32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_fp32.c index af9399525b..dbeb452223 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__pair_fp64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_fp64.c index 1fd88c702f..32a36a7210 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int16.c b/GraphBLAS/FactoryKernels/GB_aop__pair_int16.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_int16.c index 8a3313e599..f0a7a3045c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int32.c b/GraphBLAS/FactoryKernels/GB_aop__pair_int32.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_int32.c index 411baf233b..39d8a98c47 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int64.c b/GraphBLAS/FactoryKernels/GB_aop__pair_int64.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_int64.c index cad8dbd660..1214b22688 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int8.c b/GraphBLAS/FactoryKernels/GB_aop__pair_int8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_int8.c index 53ef7b38b2..57770c617e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__pair_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_uint16.c index ed8a9acf15..5b51f01ba8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__pair_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_uint32.c index 58e3eb6c01..b9bd95d6c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__pair_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_uint64.c index 5ac57b488c..2e8b20632c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__pair_uint8.c similarity index 90% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__pair_uint8.c index f625811fcf..df78ca5552 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pair_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pair_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = 1 @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pair_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pair_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__plus_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_fc32.c index bc1f3efbd1..d744d94f20 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_add (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__plus_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_fc64.c index 6ec7b65a8c..57aea97e3f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_add (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__plus_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_fp32.c index 8403f4360c..f0714958ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__plus_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_fp64.c index ba6e3f1d41..88d46112d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int16.c b/GraphBLAS/FactoryKernels/GB_aop__plus_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_int16.c index eba0bdb6b1..7dbd64ef95 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int32.c b/GraphBLAS/FactoryKernels/GB_aop__plus_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_int32.c index 1f145df754..63b2df6fcf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int64.c b/GraphBLAS/FactoryKernels/GB_aop__plus_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_int64.c index 6066d9bf2d..a9ce26ebf8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int8.c b/GraphBLAS/FactoryKernels/GB_aop__plus_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_int8.c index b303c3ccde..bec872e5ab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__plus_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_uint16.c index 0aa5b84aa3..5d77a66173 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__plus_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_uint32.c index ce0862ed0e..06cfb2460a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__plus_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_uint64.c index d94bf82aac..04ab227f3d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__plus_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__plus_uint8.c index cd798cfa4a..7847f81577 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__plus_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) + (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__plus_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__plus_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__pow_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_fc32.c index 57163e0841..7d60be81e2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_pow (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__pow_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_fc64.c index 704845ca2a..1795d0b866 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_pow (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__pow_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_fp32.c index e8ff7977ad..f3d5d82c3b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_powf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__pow_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_fp64.c index a2fbdb555f..0be046dfb7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int16.c b/GraphBLAS/FactoryKernels/GB_aop__pow_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_int16.c index 53058e3300..f65a3edd4b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_int16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int32.c b/GraphBLAS/FactoryKernels/GB_aop__pow_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_int32.c index ad0a591f4a..dc99faa9bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_int32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int64.c b/GraphBLAS/FactoryKernels/GB_aop__pow_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_int64.c index e87e9b0a38..30812db6df 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_int64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int8.c b/GraphBLAS/FactoryKernels/GB_aop__pow_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_int8.c index 87abc0ebb4..df1f7db756 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_int8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__pow_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_uint16.c index 14e114eaf6..abe0128754 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_uint16 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__pow_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_uint32.c index 0267e65370..28db91d74d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_uint32 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__pow_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_uint64.c index 3446000634..dc5106595a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_uint64 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__pow_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__pow_uint8.c index e353cdf90f..f82345c5b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__pow_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__pow_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_pow_uint8 (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__pow_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__pow_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_fc32.c index ba90793bda..c7418cbdc0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_div (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_fc64.c index bb24eee9d1..60d5d667c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_div (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_fp32.c index db26071162..f658accdc2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) / (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_fp64.c index 2854f066e2..157663acf0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) / (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_int16.c index 15a6ad6a5d..5d7c4485aa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int16 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_int32.c index 16ee55c71b..2ba6471dbe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int32 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_int64.c index adb7035438..f18213322d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int64 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_int8.c index 85233f99c2..7f22ecffb2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_int8 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_uint16.c index 197f7181c6..2f3ba0bbc8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint16 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_uint32.c index 9873061bf8..d4484e6ff9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint32 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_uint64.c index 19ac6ddf19..281ce7e316 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint64 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__rdiv_uint8.c index b3928af119..d46c87c6d9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rdiv_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_idiv_uint8 (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rdiv_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rdiv_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__remainder_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__remainder_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__remainder_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__remainder_fp32.c index b32c9d7dcc..80340602a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__remainder_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__remainder_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = remainderf (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__remainder_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__remainder_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__remainder_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__remainder_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__remainder_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__remainder_fp64.c index 958a8dc0a5..c6c41d00b9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__remainder_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__remainder_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = remainder (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__remainder_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__remainder_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_fc32.c index c06d9581f5..c0362e4a0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_minus (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_fc64.c index 7b543fddaa..c89105c6f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_minus (y, x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_fp32.c index b9182e61b4..9343fa2f81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_fp64.c index 28a700defd..8452dca3d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int16.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_int16.c index 0353b04cfc..ffdcce61c9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int32.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_int32.c index dc1d3107ca..6e9824985a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int64.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_int64.c index 3afcbe2796..15903f9512 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int8.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_int8.c index 1dc0e06d7e..6a4047647a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_uint16.c index da9afa5ec9..7692050ca1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_uint32.c index 8a53195217..801ee54d50 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_uint64.c index 02054622b1..140b2bf591 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__rminus_uint8.c index 4a450f3825..532b553b73 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__rminus_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (y) - (x) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__rminus_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__rminus_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_bool.c b/GraphBLAS/FactoryKernels/GB_aop__second_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_bool.c rename to GraphBLAS/FactoryKernels/GB_aop__second_bool.c index 6836e7542c..07ec20f53f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_bool.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_bool) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_bool) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__second_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__second_fc32.c index 9c9a3678fb..ed8c08a583 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__second_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__second_fc64.c index d3310600e7..c25a69cd61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__second_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__second_fp32.c index e8f3234b22..b6a474b79d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__second_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__second_fp64.c index 884becdcd2..61d9282119 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int16.c b/GraphBLAS/FactoryKernels/GB_aop__second_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__second_int16.c index fa24a5de55..a0974fc425 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int32.c b/GraphBLAS/FactoryKernels/GB_aop__second_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__second_int32.c index e413e58f5d..f2b035193e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int64.c b/GraphBLAS/FactoryKernels/GB_aop__second_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__second_int64.c index a3b8a9dd95..436e68fb9b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int8.c b/GraphBLAS/FactoryKernels/GB_aop__second_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__second_int8.c index 640cc6c752..ed4755352d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__second_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__second_uint16.c index 6da4aa8256..96ae6b16a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__second_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__second_uint32.c index 4da8f84979..dc6392df5e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__second_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__second_uint64.c index 4a3acf91a6..1861db63e5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__second_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__second_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__second_uint8.c index 7217afda0b..9cd85520a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__second_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = y @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__second_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__second_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fc32.c b/GraphBLAS/FactoryKernels/GB_aop__times_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_fc32.c rename to GraphBLAS/FactoryKernels/GB_aop__times_fc32.c index e54a339a0a..da610c6066 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_fc32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC32_mul (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_fc32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_fc32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fc64.c b/GraphBLAS/FactoryKernels/GB_aop__times_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_fc64.c rename to GraphBLAS/FactoryKernels/GB_aop__times_fc64.c index cb73ee17ac..935fd0a857 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_fc64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = GB_FC64_mul (x, y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_fc64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_fc64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fp32.c b/GraphBLAS/FactoryKernels/GB_aop__times_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_fp32.c rename to GraphBLAS/FactoryKernels/GB_aop__times_fp32.c index 6c30cd3120..487cc9f4a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_fp32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_fp32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_fp32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fp64.c b/GraphBLAS/FactoryKernels/GB_aop__times_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_fp64.c rename to GraphBLAS/FactoryKernels/GB_aop__times_fp64.c index 4e3ec49ed7..4e27b49d84 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_fp64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_fp64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_fp64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int16.c b/GraphBLAS/FactoryKernels/GB_aop__times_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_int16.c rename to GraphBLAS/FactoryKernels/GB_aop__times_int16.c index 0260a829db..2593f4246f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_int16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_int16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_int16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int32.c b/GraphBLAS/FactoryKernels/GB_aop__times_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_int32.c rename to GraphBLAS/FactoryKernels/GB_aop__times_int32.c index 0db287a7af..06e7a9546d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_int32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_int32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_int32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int64.c b/GraphBLAS/FactoryKernels/GB_aop__times_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_int64.c rename to GraphBLAS/FactoryKernels/GB_aop__times_int64.c index 6a7af82894..8c016b1ea4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_int64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_int64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_int64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int8.c b/GraphBLAS/FactoryKernels/GB_aop__times_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_int8.c rename to GraphBLAS/FactoryKernels/GB_aop__times_int8.c index 07af70b5ad..07ae8e4c7d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_int8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_int8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_int8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint16.c b/GraphBLAS/FactoryKernels/GB_aop__times_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_uint16.c rename to GraphBLAS/FactoryKernels/GB_aop__times_uint16.c index 82411d3f31..6c3d719eeb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_uint16.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_uint16) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_uint16) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint32.c b/GraphBLAS/FactoryKernels/GB_aop__times_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_uint32.c rename to GraphBLAS/FactoryKernels/GB_aop__times_uint32.c index 186349331b..ca7dbd20fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_uint32.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_uint32) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_uint32) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint64.c b/GraphBLAS/FactoryKernels/GB_aop__times_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_uint64.c rename to GraphBLAS/FactoryKernels/GB_aop__times_uint64.c index ed4f1ddb35..014f0d1ff1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_uint64.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_uint64) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_uint64) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint8.c b/GraphBLAS/FactoryKernels/GB_aop__times_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_aop__times_uint8.c rename to GraphBLAS/FactoryKernels/GB_aop__times_uint8.c index f34b4cc295..2764b3816b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_aop__times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_aop__times_uint8.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator #define GB_ACCUM_OP(z,x,y) z = (x) * (y) @@ -56,7 +56,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -76,7 +76,7 @@ GrB_Info GB (_subassign_23__times_uint8) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } return (GrB_SUCCESS) ; @@ -102,7 +102,7 @@ GrB_Info GB (_subassign_22__times_uint8) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__bool.c b/GraphBLAS/FactoryKernels/GB_as__bool.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__bool.c rename to GraphBLAS/FactoryKernels/GB_as__bool.c index f0005cfaf8..29ba123d8a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__bool.c +++ b/GraphBLAS/FactoryKernels/GB_as__bool.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE bool @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__bool) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__bool) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__bool) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__fc32.c b/GraphBLAS/FactoryKernels/GB_as__fc32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__fc32.c rename to GraphBLAS/FactoryKernels/GB_as__fc32.c index 4cefbbd711..1f3b97ca2f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__fc32.c +++ b/GraphBLAS/FactoryKernels/GB_as__fc32.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE GxB_FC32_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__fc32) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__fc32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__fc32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__fc64.c b/GraphBLAS/FactoryKernels/GB_as__fc64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__fc64.c rename to GraphBLAS/FactoryKernels/GB_as__fc64.c index d156dcdf42..4e6be9e908 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__fc64.c +++ b/GraphBLAS/FactoryKernels/GB_as__fc64.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE GxB_FC64_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__fc64) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__fc64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__fc64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__fp32.c b/GraphBLAS/FactoryKernels/GB_as__fp32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__fp32.c rename to GraphBLAS/FactoryKernels/GB_as__fp32.c index fe6558ad1b..7c65bc7918 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__fp32.c +++ b/GraphBLAS/FactoryKernels/GB_as__fp32.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE float @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__fp32) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__fp32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__fp32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__fp64.c b/GraphBLAS/FactoryKernels/GB_as__fp64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__fp64.c rename to GraphBLAS/FactoryKernels/GB_as__fp64.c index cccc9c43ce..01c9215625 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__fp64.c +++ b/GraphBLAS/FactoryKernels/GB_as__fp64.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE double @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__fp64) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__fp64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__fp64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__include.h b/GraphBLAS/FactoryKernels/GB_as__include.h similarity index 98% rename from GraphBLAS/Source/FactoryKernels/GB_as__include.h rename to GraphBLAS/FactoryKernels/GB_as__include.h index e02fbfddf9..1555de0271 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__include.h +++ b/GraphBLAS/FactoryKernels/GB_as__include.h @@ -2,11 +2,11 @@ // GB_as__include.h: definitions for GB_as__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_as.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_subassign_05d__bool) ( diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__int16.c b/GraphBLAS/FactoryKernels/GB_as__int16.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__int16.c rename to GraphBLAS/FactoryKernels/GB_as__int16.c index 1156df3b81..2bfbb2c87f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__int16.c +++ b/GraphBLAS/FactoryKernels/GB_as__int16.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE int16_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__int16) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__int16) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__int16) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__int32.c b/GraphBLAS/FactoryKernels/GB_as__int32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__int32.c rename to GraphBLAS/FactoryKernels/GB_as__int32.c index 67bbddb4e9..a204abedda 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__int32.c +++ b/GraphBLAS/FactoryKernels/GB_as__int32.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE int32_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__int32) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__int32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__int32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__int64.c b/GraphBLAS/FactoryKernels/GB_as__int64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__int64.c rename to GraphBLAS/FactoryKernels/GB_as__int64.c index 4816f19e5b..c54c28265a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__int64.c +++ b/GraphBLAS/FactoryKernels/GB_as__int64.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE int64_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__int64) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__int64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__int64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__int8.c b/GraphBLAS/FactoryKernels/GB_as__int8.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__int8.c rename to GraphBLAS/FactoryKernels/GB_as__int8.c index 036dff5a4c..8d54b62d35 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__int8.c +++ b/GraphBLAS/FactoryKernels/GB_as__int8.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE int8_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__int8) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__int8) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__int8) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__uint16.c b/GraphBLAS/FactoryKernels/GB_as__uint16.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__uint16.c rename to GraphBLAS/FactoryKernels/GB_as__uint16.c index 744dc18799..eaf35ca618 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__uint16.c +++ b/GraphBLAS/FactoryKernels/GB_as__uint16.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE uint16_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__uint16) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__uint16) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__uint16) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__uint32.c b/GraphBLAS/FactoryKernels/GB_as__uint32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__uint32.c rename to GraphBLAS/FactoryKernels/GB_as__uint32.c index b0b656f664..635af2766d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__uint32.c +++ b/GraphBLAS/FactoryKernels/GB_as__uint32.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE uint32_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__uint32) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__uint32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__uint32) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__uint64.c b/GraphBLAS/FactoryKernels/GB_as__uint64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__uint64.c rename to GraphBLAS/FactoryKernels/GB_as__uint64.c index bf306eb996..4b39ed0a42 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__uint64.c +++ b/GraphBLAS/FactoryKernels/GB_as__uint64.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE uint64_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__uint64) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__uint64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__uint64) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_as__uint8.c b/GraphBLAS/FactoryKernels/GB_as__uint8.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_as__uint8.c rename to GraphBLAS/FactoryKernels/GB_as__uint8.c index f5e2e98a5f..91686e4726 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_as__uint8.c +++ b/GraphBLAS/FactoryKernels/GB_as__uint8.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices #define GB_A_TYPE uint8_t @@ -30,7 +30,7 @@ #define GB_DISABLE 0 #endif -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -51,7 +51,7 @@ GrB_Info GB (_subassign_05d__uint8) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -74,7 +74,7 @@ GrB_Info GB (_subassign_06d__uint8) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -97,7 +97,7 @@ GrB_Info GB (_subassign_25__uint8) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_bool.c b/GraphBLAS/FactoryKernels/GB_bld__any_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__any_bool.c index 0824a1b57a..27aadacb10 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fc32.c b/GraphBLAS/FactoryKernels/GB_bld__any_fc32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_fc32.c rename to GraphBLAS/FactoryKernels/GB_bld__any_fc32.c index 8bc9f7e92d..588de1e6d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_fc32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fc64.c b/GraphBLAS/FactoryKernels/GB_bld__any_fc64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_fc64.c rename to GraphBLAS/FactoryKernels/GB_bld__any_fc64.c index c6b256cfa8..d70e227fb0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_fc64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__any_fp32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__any_fp32.c index 1258aca581..b0de6bbf34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__any_fp64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__any_fp64.c index a5066be4a7..6274fea6be 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int16.c b/GraphBLAS/FactoryKernels/GB_bld__any_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__any_int16.c index ce40e7950c..eef41c433c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int32.c b/GraphBLAS/FactoryKernels/GB_bld__any_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__any_int32.c index 222bbe2d79..61f8d50179 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int64.c b/GraphBLAS/FactoryKernels/GB_bld__any_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__any_int64.c index e717dc4776..affe55da2a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int8.c b/GraphBLAS/FactoryKernels/GB_bld__any_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__any_int8.c index b47668a6e9..8c7d347b0e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__any_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__any_uint16.c index 919ce5a12a..35624aaa4d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__any_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__any_uint32.c index eabd7a4c7b..c15f89e3d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__any_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__any_uint64.c index a4a1b7acea..95d157ffd4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__any_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__any_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__any_uint8.c index 679d6b3246..96bc5df34a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__any_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__any_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__any_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__eq_bool.c b/GraphBLAS/FactoryKernels/GB_bld__eq_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__eq_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__eq_bool.c index 4731f72f94..46040366c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__eq_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = (Tx [k] == Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_bool.c b/GraphBLAS/FactoryKernels/GB_bld__first_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__first_bool.c index 65a95acd3e..67d0e03aaf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fc32.c b/GraphBLAS/FactoryKernels/GB_bld__first_fc32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_fc32.c rename to GraphBLAS/FactoryKernels/GB_bld__first_fc32.c index d37944837e..28b0d428d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_fc32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fc64.c b/GraphBLAS/FactoryKernels/GB_bld__first_fc64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_fc64.c rename to GraphBLAS/FactoryKernels/GB_bld__first_fc64.c index c83142c6c7..81c84bcd51 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_fc64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__first_fp32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__first_fp32.c index 6540286c75..34f028866b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__first_fp64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__first_fp64.c index 394517aff2..514319d4cf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int16.c b/GraphBLAS/FactoryKernels/GB_bld__first_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__first_int16.c index be0d5924d9..1ea30e25bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int32.c b/GraphBLAS/FactoryKernels/GB_bld__first_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__first_int32.c index 46d043ee4a..4951816ceb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int64.c b/GraphBLAS/FactoryKernels/GB_bld__first_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__first_int64.c index fa53cd4327..75235d0db4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int8.c b/GraphBLAS/FactoryKernels/GB_bld__first_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__first_int8.c index 6f8807c638..04c48c6730 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__first_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__first_uint16.c index 228010e3bc..8dce273850 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__first_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__first_uint32.c index 3a59cd7225..a74dd76653 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__first_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__first_uint64.c index 4a958de104..b92af03200 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__first_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__first_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__first_uint8.c index f39b4cef25..a13a38cabd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__first_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__include.h b/GraphBLAS/FactoryKernels/GB_bld__include.h similarity index 99% rename from GraphBLAS/Source/FactoryKernels/GB_bld__include.h rename to GraphBLAS/FactoryKernels/GB_bld__include.h index 6197da7d5b..371c2ee40d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__include.h +++ b/GraphBLAS/FactoryKernels/GB_bld__include.h @@ -2,11 +2,11 @@ // GB_bld__include.h: definitions for GB_bld__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_bld.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_bld__min_int8) ( diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__land_bool.c b/GraphBLAS/FactoryKernels/GB_bld__land_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__land_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__land_bool.c index 333475ae10..d16e295d13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__land_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = (Tx [k] && Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__lor_bool.c b/GraphBLAS/FactoryKernels/GB_bld__lor_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__lor_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__lor_bool.c index b6dcd35c89..c12348e233 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__lor_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = (Tx [k] || Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__lxor_bool.c b/GraphBLAS/FactoryKernels/GB_bld__lxor_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__lxor_bool.c index 3364fb88b3..22b497acd3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__lxor_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = (Tx [k] != Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__max_fp32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__max_fp32.c index e4f17d265a..3634bd547f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if ((Sx [i] > Tx [k]) || (Tx [k] != Tx [k])) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__max_fp64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__max_fp64.c index 86bdfdcbaa..318bfbea94 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if ((Sx [i] > Tx [k]) || (Tx [k] != Tx [k])) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int16.c b/GraphBLAS/FactoryKernels/GB_bld__max_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__max_int16.c index 76407d32c4..16643cf128 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int32.c b/GraphBLAS/FactoryKernels/GB_bld__max_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__max_int32.c index b32f353d15..8a7d7b6460 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int64.c b/GraphBLAS/FactoryKernels/GB_bld__max_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__max_int64.c index fc5e350e7c..7f647e5059 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int8.c b/GraphBLAS/FactoryKernels/GB_bld__max_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__max_int8.c index ad410db859..7e39534691 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__max_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__max_uint16.c index 86cf2a5bf8..12fde29417 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__max_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__max_uint32.c index b01cd9b761..3dbe7b9386 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__max_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__max_uint64.c index 48d85e851b..5c056a61da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__max_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__max_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__max_uint8.c index 7a701c5d4d..9bb892717d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__max_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] > Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__min_fp32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__min_fp32.c index d0ad1a3a3f..8ba8a593eb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if ((Sx [i] < Tx [k]) || (Tx [k] != Tx [k])) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__min_fp64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__min_fp64.c index 6993f3e9aa..cb19e51619 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if ((Sx [i] < Tx [k]) || (Tx [k] != Tx [k])) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int16.c b/GraphBLAS/FactoryKernels/GB_bld__min_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__min_int16.c index f254ab1f38..ec06b69c22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int32.c b/GraphBLAS/FactoryKernels/GB_bld__min_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__min_int32.c index 8b8e2e4ed5..1f0ebf312d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int64.c b/GraphBLAS/FactoryKernels/GB_bld__min_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__min_int64.c index c9d8569fc4..c9220f2b3d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int8.c b/GraphBLAS/FactoryKernels/GB_bld__min_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__min_int8.c index a52234d315..4034493a41 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__min_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__min_uint16.c index f82f783d76..88319d6233 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__min_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__min_uint32.c index 942d3e3f8a..b86a8e59c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__min_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__min_uint64.c index 5c499cc468..948e82363e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__min_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__min_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__min_uint8.c index 6aba163bae..8638aafa98 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__min_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) if (Sx [i] < Tx [k]) { Tx [k] = Sx [i] ; } @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fc32.c b/GraphBLAS/FactoryKernels/GB_bld__plus_fc32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_fc32.c index 613ff39904..8158f26820 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_fc32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = GB_FC32_add (Tx [k], Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fc64.c b/GraphBLAS/FactoryKernels/GB_bld__plus_fc64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_fc64.c index 9969320728..67aad8873a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_fc64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = GB_FC64_add (Tx [k], Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__plus_fp32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_fp32.c index 63f97bc45d..5de0ae2704 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__plus_fp64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_fp64.c index 04b8270cc8..42507fe843 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int16.c b/GraphBLAS/FactoryKernels/GB_bld__plus_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_int16.c index 63680448a7..fdc62d86a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int32.c b/GraphBLAS/FactoryKernels/GB_bld__plus_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_int32.c index fba5ac1999..556200cd96 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int64.c b/GraphBLAS/FactoryKernels/GB_bld__plus_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_int64.c index 22f4dc8442..b8fb5c44bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int8.c b/GraphBLAS/FactoryKernels/GB_bld__plus_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_int8.c index 30237160c5..cb7251c18e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__plus_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_uint16.c index 7be0f57431..1756e330ea 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__plus_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_uint32.c index 45adab3eb4..e8ae26e355 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__plus_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_uint64.c index be46590cc3..4b79c1b66d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__plus_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__plus_uint8.c index 00914049b7..002f78e561 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__plus_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] += Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_bool.c b/GraphBLAS/FactoryKernels/GB_bld__second_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_bool.c rename to GraphBLAS/FactoryKernels/GB_bld__second_bool.c index 91c3183fc5..8556ce60a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_bool.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fc32.c b/GraphBLAS/FactoryKernels/GB_bld__second_fc32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_fc32.c rename to GraphBLAS/FactoryKernels/GB_bld__second_fc32.c index 7feea33044..901232fd34 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_fc32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fc64.c b/GraphBLAS/FactoryKernels/GB_bld__second_fc64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_fc64.c rename to GraphBLAS/FactoryKernels/GB_bld__second_fc64.c index 1ef6b5809f..e3d5712803 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_fc64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__second_fp32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__second_fp32.c index 80851c8f80..4f3d3787f7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__second_fp64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__second_fp64.c index 5ba7084cc6..e680502ded 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int16.c b/GraphBLAS/FactoryKernels/GB_bld__second_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__second_int16.c index 872b556898..a81c7472ff 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int32.c b/GraphBLAS/FactoryKernels/GB_bld__second_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__second_int32.c index 4b50ab5846..7af5ced211 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int64.c b/GraphBLAS/FactoryKernels/GB_bld__second_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__second_int64.c index 5a179433a2..718d7df653 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int8.c b/GraphBLAS/FactoryKernels/GB_bld__second_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__second_int8.c index 3310f3b612..8692636e7a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__second_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__second_uint16.c index fe9120ef66..ff98c08026 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__second_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__second_uint32.c index 3b5f0d65b1..913b695f81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__second_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__second_uint64.c index 5ea8cadf23..f88269c059 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__second_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__second_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__second_uint8.c index de92d84259..2436463299 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__second_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fc32.c b/GraphBLAS/FactoryKernels/GB_bld__times_fc32.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_fc32.c rename to GraphBLAS/FactoryKernels/GB_bld__times_fc32.c index 4def3974bf..e66b0e5ae4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_fc32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = GB_FC32_mul (Tx [k], Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fc64.c b/GraphBLAS/FactoryKernels/GB_bld__times_fc64.c similarity index 87% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_fc64.c rename to GraphBLAS/FactoryKernels/GB_bld__times_fc64.c index 829e55184b..803bf7dd0e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_fc64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] = GB_FC64_mul (Tx [k], Sx [i]) @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fp32.c b/GraphBLAS/FactoryKernels/GB_bld__times_fp32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_fp32.c rename to GraphBLAS/FactoryKernels/GB_bld__times_fp32.c index 3fa071d684..fc05ce6101 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_fp32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fp64.c b/GraphBLAS/FactoryKernels/GB_bld__times_fp64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_fp64.c rename to GraphBLAS/FactoryKernels/GB_bld__times_fp64.c index b3da134a5c..002653fd4e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_fp64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int16.c b/GraphBLAS/FactoryKernels/GB_bld__times_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_int16.c rename to GraphBLAS/FactoryKernels/GB_bld__times_int16.c index c85bd4df4d..b7095152e7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_int16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int32.c b/GraphBLAS/FactoryKernels/GB_bld__times_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_int32.c rename to GraphBLAS/FactoryKernels/GB_bld__times_int32.c index 22841102d9..18ddf86dd9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_int32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int64.c b/GraphBLAS/FactoryKernels/GB_bld__times_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_int64.c rename to GraphBLAS/FactoryKernels/GB_bld__times_int64.c index d777386794..8b932a4c61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_int64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int8.c b/GraphBLAS/FactoryKernels/GB_bld__times_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_int8.c rename to GraphBLAS/FactoryKernels/GB_bld__times_int8.c index 866fc7a26a..ee4715f01a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_int8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint16.c b/GraphBLAS/FactoryKernels/GB_bld__times_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_uint16.c rename to GraphBLAS/FactoryKernels/GB_bld__times_uint16.c index f8bab58e7c..dcab28af67 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_uint16.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint32.c b/GraphBLAS/FactoryKernels/GB_bld__times_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_uint32.c rename to GraphBLAS/FactoryKernels/GB_bld__times_uint32.c index 1e4c144835..53f1928efd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_uint32.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint64.c b/GraphBLAS/FactoryKernels/GB_bld__times_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_uint64.c rename to GraphBLAS/FactoryKernels/GB_bld__times_uint64.c index 4e8fb71ea6..1ebeb999c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_uint64.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint8.c b/GraphBLAS/FactoryKernels/GB_bld__times_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_bld__times_uint8.c rename to GraphBLAS/FactoryKernels/GB_bld__times_uint8.c index 3a2065298b..b1ba114719 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_bld__times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_bld__times_uint8.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here #define GB_BLD_DUP(Tx,k,Sx,i) Tx [k] *= Sx [i] @@ -31,7 +31,7 @@ #define GB_DISABLE 0 #endif -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -54,7 +54,7 @@ GrB_Info GB (_bld__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__atan2_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__atan2_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__atan2_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__atan2_fp32.c index 462e60cb05..3fb221ca7f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__atan2_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__atan2_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = atan2f (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__atan2_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__atan2_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__atan2_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__atan2_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__atan2_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__atan2_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__atan2_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__atan2_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__atan2_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__atan2_fp64.c index 1c2c453652..6a1792790f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__atan2_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__atan2_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = atan2 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__atan2_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__atan2_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__atan2_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__atan2_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__atan2_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__atan2_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int16.c b/GraphBLAS/FactoryKernels/GB_ew__band_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__band_int16.c index aff2f810a5..6114d8465c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__band_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__band_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__band_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__band_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__band_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__band_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__band_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__band_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__band_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__band_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int32.c b/GraphBLAS/FactoryKernels/GB_ew__band_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__band_int32.c index 5cc3012ee1..dcd82e1434 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__band_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__band_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__band_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__band_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__band_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__band_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__band_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__band_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__band_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__band_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int64.c b/GraphBLAS/FactoryKernels/GB_ew__band_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__band_int64.c index 7607262c7f..5e820733de 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__band_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__band_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__band_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__band_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__band_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__band_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__band_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__band_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__band_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__band_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int8.c b/GraphBLAS/FactoryKernels/GB_ew__band_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__band_int8.c index 6cba58b851..0df64520a7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__band_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__band_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__band_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__band_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__band_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__band_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__band_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__band_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__band_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__band_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__band_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__band_uint16.c index ea677d5b8b..063e13d527 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__band_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__band_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__band_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__band_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__band_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__band_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__band_uint32.c index 5294856593..4f9fe3926f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__band_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__band_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__band_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__band_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__band_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__band_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__band_uint64.c index d433115217..95bd49e226 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__band_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__band_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__band_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__band_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__band_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__band_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__band_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__band_uint8.c index 0360844ad4..f3877aa1ee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__band_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__band_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) & (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__band_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__band_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__band_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__band_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__band_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__band_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_int16.c index 16d363f5aa..8e2d5b9a19 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_int16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_int32.c index a054bafbd0..4670d7009d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_int32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_int64.c index e1eefa52f8..3cd3ece220 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_int64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_int8.c index 0c32725c24..8092250ece 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_int8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_uint16.c index 144535fecb..c3a6369089 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_uint16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_uint32.c index 10486b8c22..e12e272e90 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_uint32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_uint64.c index 8ba7eb66ff..d16ff12f44 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_uint64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bclr_uint8.c index 391ebbf7b6..d545c003b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bclr_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bclr_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitclr_uint8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bclr_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bclr_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bclr_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bclr_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bclr_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bclr_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bget_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_int16.c index 24b3264df0..c88a73df80 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_int16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bget_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_int32.c index 0c927411dc..92c594093a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_int32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bget_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_int64.c index ce1e8e39d9..366a247be1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_int64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bget_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_int8.c index 4f6e728454..92d8d977c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_int8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bget_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_uint16.c index 962e17a85c..f3d1d053f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_uint16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bget_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_uint32.c index 336c135417..653422c53f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_uint32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bget_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_uint64.c index 9776e8bc26..829db2f6e8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_uint64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bget_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bget_uint8.c index cff1cdea8d..bb1e43d400 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bget_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bget_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitget_uint8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bget_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bget_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bget_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bget_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bget_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bget_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_int16.c index d22a0c245f..82cb42bf5a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bor_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bor_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_int32.c index c02822e4f0..485ebb117d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bor_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bor_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_int64.c index a8481286fb..ea838e4e1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bor_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bor_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_int8.c index 82d3c5b81d..1af7d983ce 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bor_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bor_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_uint16.c index ca6a497601..0343737303 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bor_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bor_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_uint32.c index 4542a5642a..f2bedb7076 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bor_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bor_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_uint64.c index 40044d80da..19773c5de0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bor_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bor_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bor_uint8.c index 345ca55a62..6140048531 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bor_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) | (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bor_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bor_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bor_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bset_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_int16.c index b85eb94e37..cd12f5be05 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_int16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bset_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_int32.c index 0597132b40..67911d7e48 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_int32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bset_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_int64.c index 8000a76d52..84d1d67198 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_int64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bset_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_int8.c index ea43bc0bc4..8cb89d3b81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_int8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bset_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_uint16.c index 6b1b375844..16d8224b6e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_uint16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bset_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_uint32.c index 6aae90ba7e..fcd5e4ac47 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_uint32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bset_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_uint64.c index 3654527fed..761fbbec72 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_uint64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bset_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bset_uint8.c index 0d13b27984..0cdc899c33 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bset_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bset_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitset_uint8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bset_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bset_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bset_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bset_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bset_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bset_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_int16.c index e96bdaba86..f4d42b10d0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_int16 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_int32.c index 269d10be00..978633e784 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_int32 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_int64.c index 678de9b1c9..8538684f9b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_int64 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_int8.c index f58263c8e3..8953c1c626 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_int8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bshift_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bshift_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bshift_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__bshift_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__bshift_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__bshift_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_uint16.c index b3df83d6c8..5c14a08fc1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_uint16 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_uint32.c index 72742e0b6a..454c004a86 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_uint32 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_uint64.c index 8b017072f2..0d27214a64 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_uint64 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bshift_uint8.c index d42ddbddf3..0dad045e83 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bshift_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bshift_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_bitshift_uint8 (x, y) @@ -42,7 +44,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -56,7 +58,7 @@ GrB_Info GB (_Cewise_fulln__bshift_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AaddB__bshift_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -145,7 +147,7 @@ GrB_Info GB (_AunionB__bshift_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -173,7 +175,7 @@ GrB_Info GB (_AemultB_08__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -199,7 +201,7 @@ GrB_Info GB (_AemultB_02__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -225,7 +227,7 @@ GrB_Info GB (_AemultB_03__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -250,7 +252,7 @@ GrB_Info GB (_AemultB_04__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -276,7 +278,7 @@ GrB_Info GB (_AemultB_bitmap__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -298,7 +300,7 @@ GrB_Info GB (_bind1st__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -320,7 +322,7 @@ GrB_Info GB (_bind2nd__bshift_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -354,7 +356,7 @@ GrB_Info GB (_bind1st_tran__bshift_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd_tran__bshift_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_int16.c index 9c55304c85..3ceb9b50e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxnor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxnor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxnor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxnor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxnor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxnor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxnor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxnor_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_int32.c index 4f336c2e13..918e087469 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxnor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxnor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxnor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxnor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxnor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxnor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxnor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxnor_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_int64.c index c1e9b7452f..5d19631631 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxnor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxnor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxnor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxnor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxnor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxnor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxnor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxnor_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_int8.c index cf932fe461..1403b448e7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxnor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxnor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxnor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxnor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxnor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxnor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxnor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxnor_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_uint16.c index 99600516f2..f3cac2a0c7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxnor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxnor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxnor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxnor_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_uint32.c index f064c675c3..63689aec58 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxnor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxnor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxnor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxnor_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_uint64.c index 062a1dbf79..a91cdd4fe3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxnor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxnor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxnor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxnor_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bxnor_uint8.c index afec00b766..7b46d4bec4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxnor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxnor_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ~((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxnor_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxnor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxnor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxnor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxnor_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxnor_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int16.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_int16.c index 53c6dbe5bb..465f7a1384 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxor_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxor_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int32.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_int32.c index f9646d15a0..328cadce13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxor_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxor_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int64.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_int64.c index 17f224fd66..af7b937531 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxor_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxor_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int8.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_int8.c index 7b1adae54d..3b6dd7529b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__bxor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__bxor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__bxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__bxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__bxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__bxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__bxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__bxor_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__bxor_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_uint16.c index 50e9fe0a31..1fe4ba7e85 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxor_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxor_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_uint32.c index d0d7936249..32c4e8319a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxor_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxor_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_uint64.c index a16d47ad10..672b794072 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxor_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxor_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__bxor_uint8.c index e042a87d77..c13e709966 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__bxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__bxor_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) ^ (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__bxor_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__bxor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__bxor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__bxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__bxor_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__bxor_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__cmplx_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__cmplx_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__cmplx_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__cmplx_fp32.c index 777a90426d..7a0835f8f7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__cmplx_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__cmplx_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GJ_CMPLX32 (x, y) @@ -44,7 +46,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -58,7 +60,7 @@ GrB_Info GB (_Cewise_fulln__cmplx_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -100,7 +102,7 @@ GrB_Info GB (_AaddB__cmplx_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_AunionB__cmplx_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -175,7 +177,7 @@ GrB_Info GB (_AemultB_08__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_AemultB_02__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -227,7 +229,7 @@ GrB_Info GB (_AemultB_03__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -252,7 +254,7 @@ GrB_Info GB (_AemultB_04__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -278,7 +280,7 @@ GrB_Info GB (_AemultB_bitmap__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -300,7 +302,7 @@ GrB_Info GB (_bind1st__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -322,7 +324,7 @@ GrB_Info GB (_bind2nd__cmplx_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -356,7 +358,7 @@ GrB_Info GB (_bind1st_tran__cmplx_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -390,7 +392,7 @@ GrB_Info GB (_bind2nd_tran__cmplx_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__cmplx_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__cmplx_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__cmplx_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__cmplx_fp64.c index f543f8209b..57a77a4e04 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__cmplx_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__cmplx_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GJ_CMPLX64 (x, y) @@ -44,7 +46,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -58,7 +60,7 @@ GrB_Info GB (_Cewise_fulln__cmplx_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -100,7 +102,7 @@ GrB_Info GB (_AaddB__cmplx_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_AunionB__cmplx_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -175,7 +177,7 @@ GrB_Info GB (_AemultB_08__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_AemultB_02__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -227,7 +229,7 @@ GrB_Info GB (_AemultB_03__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -252,7 +254,7 @@ GrB_Info GB (_AemultB_04__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -278,7 +280,7 @@ GrB_Info GB (_AemultB_bitmap__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -300,7 +302,7 @@ GrB_Info GB (_bind1st__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -322,7 +324,7 @@ GrB_Info GB (_bind2nd__cmplx_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -356,7 +358,7 @@ GrB_Info GB (_bind1st_tran__cmplx_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -390,7 +392,7 @@ GrB_Info GB (_bind2nd_tran__cmplx_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__copysign_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__copysign_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__copysign_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__copysign_fp32.c index f93a3ca5d8..990556e704 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__copysign_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__copysign_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = copysignf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__copysign_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__copysign_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__copysign_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__copysign_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__copysign_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__copysign_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__copysign_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__copysign_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__copysign_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__copysign_fp64.c index 92da2721e7..9f3f908026 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__copysign_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__copysign_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = copysign (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__copysign_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__copysign_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__copysign_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__copysign_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__copysign_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__copysign_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__div_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__div_fc32.c index 517af52dc6..c900684f88 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_div (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_fc32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__div_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__div_fc64.c index 9630ec7e81..f0060d636a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_div (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_fc64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__div_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__div_fp32.c index e995357b23..66344b9acf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) / (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__div_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__div_fp64.c index 7b1af8c4aa..9301edd76d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) / (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int16.c b/GraphBLAS/FactoryKernels/GB_ew__div_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__div_int16.c index 98b0730045..4ba1927912 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int32.c b/GraphBLAS/FactoryKernels/GB_ew__div_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__div_int32.c index 98663b7c15..331e157e58 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int64.c b/GraphBLAS/FactoryKernels/GB_ew__div_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__div_int64.c index 5df1ac88cd..58bbbb99e7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int8.c b/GraphBLAS/FactoryKernels/GB_ew__div_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__div_int8.c index e1e9821a18..4a8798efe8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__div_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__div_uint16.c index 8b6a9a7775..329bed90c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__div_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__div_uint32.c index 9858db7c8d..80277dd97d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__div_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__div_uint64.c index 88a3677d8d..48489c7a1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__div_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__div_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__div_uint8.c index 01f69f4dc4..9e1e0f8a70 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__div_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__div_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__div_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__div_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__div_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__div_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__div_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__div_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__div_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_bool.c b/GraphBLAS/FactoryKernels/GB_ew__eq_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_bool.c index 9649cf4488..5f81afd507 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__eq_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__eq_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__eq_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__eq_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__eq_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__eq_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__eq_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_fc32.c index d4ddcd3aa0..8fb666937a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_eq (x, y) @@ -44,7 +46,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -58,7 +60,7 @@ GrB_Info GB (_Cewise_fulln__eq_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -100,7 +102,7 @@ GrB_Info GB (_AaddB__eq_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_AunionB__eq_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -175,7 +177,7 @@ GrB_Info GB (_AemultB_08__eq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_AemultB_02__eq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -226,7 +228,7 @@ GrB_Info GB (_AemultB_04__eq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -252,7 +254,7 @@ GrB_Info GB (_AemultB_bitmap__eq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_bind1st__eq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind2nd__eq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -330,7 +332,7 @@ GrB_Info GB (_bind1st_tran__eq_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -364,7 +366,7 @@ GrB_Info GB (_bind2nd_tran__eq_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__eq_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_fc64.c index b0b08d425d..af4c511132 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_eq (x, y) @@ -44,7 +46,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -58,7 +60,7 @@ GrB_Info GB (_Cewise_fulln__eq_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -100,7 +102,7 @@ GrB_Info GB (_AaddB__eq_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_AunionB__eq_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -175,7 +177,7 @@ GrB_Info GB (_AemultB_08__eq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_AemultB_02__eq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -226,7 +228,7 @@ GrB_Info GB (_AemultB_04__eq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -252,7 +254,7 @@ GrB_Info GB (_AemultB_bitmap__eq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_bind1st__eq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind2nd__eq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -330,7 +332,7 @@ GrB_Info GB (_bind1st_tran__eq_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -364,7 +366,7 @@ GrB_Info GB (_bind2nd_tran__eq_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__eq_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_fp32.c index 84dca84789..3c034fe2b6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__eq_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_fp64.c index c7ae0dd4a5..c04d751c10 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int16.c b/GraphBLAS/FactoryKernels/GB_ew__eq_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_int16.c index 6ad1831942..1f6ab537a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int32.c b/GraphBLAS/FactoryKernels/GB_ew__eq_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_int32.c index 156a85cb09..166686548c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int64.c b/GraphBLAS/FactoryKernels/GB_ew__eq_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_int64.c index e1a7d9b745..442fa14916 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int8.c b/GraphBLAS/FactoryKernels/GB_ew__eq_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_int8.c index fa19a4e214..6baa6ece37 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__eq_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_uint16.c index 607f287ed6..8d7548721b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__eq_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_uint32.c index fd0c9b11af..2dc9ecee70 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__eq_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_uint64.c index e509ccd75e..78c7856e0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__eq_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__eq_uint8.c index 10ffb8085c..2ad61924bd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__eq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__eq_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__eq_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__eq_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__eq_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__eq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__eq_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__eq_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_bool.c b/GraphBLAS/FactoryKernels/GB_ew__first_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__first_bool.c index a4e141372d..7f239e033e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__first_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__first_fc32.c index 0248e26876..05c05edab5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__first_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__first_fc64.c index aabdf64527..37cd4cd74b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__first_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__first_fp32.c index 48cacfd436..1e09e3e9e3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__first_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__first_fp64.c index e2dd44831b..d79ab84f54 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int16.c b/GraphBLAS/FactoryKernels/GB_ew__first_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__first_int16.c index ebda73f118..23a9515294 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int32.c b/GraphBLAS/FactoryKernels/GB_ew__first_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__first_int32.c index 89a9039040..057d83af0c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int64.c b/GraphBLAS/FactoryKernels/GB_ew__first_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__first_int64.c index 975ceef415..48affc5f0d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int8.c b/GraphBLAS/FactoryKernels/GB_ew__first_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__first_int8.c index bf87ee3fa0..55b1a80c22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__first_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__first_uint16.c index bd8874ecbf..4bd786e382 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__first_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__first_uint32.c index db660707b8..3ce81aa844 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__first_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__first_uint64.c index ccf3f2044e..fbd3555bbf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__first_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__first_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__first_uint8.c index 994db3c1da..e3b70cdf48 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__first_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__first_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = x @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__first_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__first_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__first_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__first_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__fmod_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__fmod_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__fmod_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__fmod_fp32.c index 9134f81ec4..580a0f468a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__fmod_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__fmod_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = fmodf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__fmod_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__fmod_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__fmod_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__fmod_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__fmod_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__fmod_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__fmod_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__fmod_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__fmod_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__fmod_fp64.c index 8a41f5faee..4fbf4e31db 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__fmod_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__fmod_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = fmod (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__fmod_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__fmod_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__fmod_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__fmod_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__fmod_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__fmod_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_bool.c b/GraphBLAS/FactoryKernels/GB_ew__ge_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_bool.c index 5c00288a2c..275bc53027 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__ge_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__ge_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__ge_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__ge_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__ge_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__ge_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__ge_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_fp32.c index 2f72523768..8f95f66f97 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__ge_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_fp64.c index 3fa1e88aa7..cc9ea588bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int16.c b/GraphBLAS/FactoryKernels/GB_ew__ge_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_int16.c index 3c92ca01f1..59fb4ccb64 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int32.c b/GraphBLAS/FactoryKernels/GB_ew__ge_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_int32.c index e0af1dc0b8..231b108643 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int64.c b/GraphBLAS/FactoryKernels/GB_ew__ge_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_int64.c index 1b5fcd1571..c2e1b2dc7c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int8.c b/GraphBLAS/FactoryKernels/GB_ew__ge_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_int8.c index 045b50c4f2..0832155558 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__ge_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_uint16.c index 6e65bc4b62..15fda25c22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__ge_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_uint32.c index d9af099ecd..983cf2608b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__ge_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_uint64.c index cfe7f37f06..8f8c277788 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__ge_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__ge_uint8.c index 55268e9e03..f41e66a94f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ge_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ge_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ge_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ge_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__ge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__ge_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__ge_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_bool.c b/GraphBLAS/FactoryKernels/GB_ew__gt_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_bool.c index bf3b058d45..d416d03543 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__gt_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__gt_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__gt_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__gt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__gt_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__gt_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__gt_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_fp32.c index ae135a7775..52db825690 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__gt_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_fp64.c index ccf0b813a7..9486191382 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int16.c b/GraphBLAS/FactoryKernels/GB_ew__gt_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_int16.c index cd22eed8a6..cbf5fd936f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int32.c b/GraphBLAS/FactoryKernels/GB_ew__gt_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_int32.c index 4bfcfd6556..cddaaab76b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int64.c b/GraphBLAS/FactoryKernels/GB_ew__gt_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_int64.c index 7a01b1c595..1f00760969 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int8.c b/GraphBLAS/FactoryKernels/GB_ew__gt_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_int8.c index ba3d063379..56dabd3eaa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__gt_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_uint16.c index 85341fb461..4e03304ab5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__gt_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_uint32.c index 82d5220bba..c7a5b4a49d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__gt_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_uint64.c index 8919730d3a..aa16b86b8f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__gt_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__gt_uint8.c index e7d747aac5..20ef5537fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__gt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__gt_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__gt_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__gt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__gt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__gt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__gt_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__gt_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__hypot_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__hypot_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__hypot_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__hypot_fp32.c index e72e90360e..da4a831d61 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__hypot_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__hypot_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = hypotf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__hypot_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__hypot_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__hypot_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__hypot_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__hypot_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__hypot_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__hypot_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__hypot_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__hypot_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__hypot_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__hypot_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__hypot_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__hypot_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__hypot_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__hypot_fp64.c index 1ddf927959..dbe3d76c3c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__hypot_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__hypot_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = hypot (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__hypot_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__hypot_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__hypot_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__hypot_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__hypot_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__hypot_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__hypot_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__hypot_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__hypot_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__hypot_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__hypot_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__include.h b/GraphBLAS/FactoryKernels/GB_ew__include.h similarity index 99% rename from GraphBLAS/Source/FactoryKernels/GB_ew__include.h rename to GraphBLAS/FactoryKernels/GB_ew__include.h index c3be2bc1ce..5d24256283 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__include.h +++ b/GraphBLAS/FactoryKernels/GB_ew__include.h @@ -2,11 +2,11 @@ // GB_ew__include.h: definitions for GB_ew__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_ew.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_Cewise_fulln__first_bool) diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_fc32.c index a32c98a74c..3e1e1f6739 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_iseq (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__iseq_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__iseq_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__iseq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__iseq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__iseq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__iseq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__iseq_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__iseq_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__iseq_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_fc64.c index 84479c44aa..db46484890 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_iseq (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__iseq_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__iseq_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__iseq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__iseq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__iseq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__iseq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__iseq_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__iseq_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__iseq_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_fp32.c index cbe3fffc84..cc6c9123f3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_fp64.c index 6eee645da1..d4dc2cfb32 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int16.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_int16.c index 948438ea8c..01aec022cb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int32.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_int32.c index 8b04b649f6..62fc530f60 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int64.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_int64.c index 6f7518f9d2..964dabbef3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int8.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_int8.c index c5c5876cac..a0c57d39b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_uint16.c index 6bd4094178..352e43d0e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_uint32.c index f58df9b9be..f0cee1cd55 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_uint64.c index 681062947e..8e7661fbec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__iseq_uint8.c index c100fdb198..6e89f16184 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__iseq_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__iseq_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) == (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__iseq_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__iseq_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__iseq_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__iseq_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__iseq_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__iseq_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__isge_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_fp32.c index 0b36fd308b..67d3334d8d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__isge_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_fp64.c index 266de65ec8..87030c84bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int16.c b/GraphBLAS/FactoryKernels/GB_ew__isge_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_int16.c index 8a1b89cf49..641bea91b7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int32.c b/GraphBLAS/FactoryKernels/GB_ew__isge_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_int32.c index 1b039f701e..195c01ffa6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int64.c b/GraphBLAS/FactoryKernels/GB_ew__isge_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_int64.c index 5349db20c3..d3463cfe2a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int8.c b/GraphBLAS/FactoryKernels/GB_ew__isge_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_int8.c index f739a086e7..96d59aa139 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__isge_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_uint16.c index c081d07eee..f057c4ba1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__isge_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_uint32.c index a59e123268..19a1746a60 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__isge_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_uint64.c index bb91194ca8..bcdd646010 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__isge_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__isge_uint8.c index c6be254aa6..f70258549d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isge_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isge_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) >= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isge_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isge_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isge_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isge_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isge_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isge_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_fp32.c index 6456dbbf82..6cbb20b6ae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_fp64.c index e01cbe4fe4..8bca3f618a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int16.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_int16.c index ee26f84c4c..60ff2d0bde 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int32.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_int32.c index 4a834528fe..d46f672b40 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int64.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_int64.c index bc4a7e5635..47b13c7d5c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int8.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_int8.c index f8b974dfe1..33ccd8be77 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_uint16.c index 7caa193b5b..4f868fd43e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_uint32.c index c22ab518f5..60f5c7e2c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_uint64.c index 5162562d46..f82daf85fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__isgt_uint8.c index 4adab0aeff..c7452d6647 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isgt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isgt_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) > (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isgt_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isgt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isgt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isgt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isgt_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isgt_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__isle_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_fp32.c index 5c5b333f6c..5487903eda 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__isle_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_fp64.c index cc43dba0b2..ee5c1ab311 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int16.c b/GraphBLAS/FactoryKernels/GB_ew__isle_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_int16.c index bf2bdae7b0..67b15a3220 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int32.c b/GraphBLAS/FactoryKernels/GB_ew__isle_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_int32.c index 3f3a57513e..a98acd1444 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int64.c b/GraphBLAS/FactoryKernels/GB_ew__isle_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_int64.c index dfed79b12d..99d3f35cf5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int8.c b/GraphBLAS/FactoryKernels/GB_ew__isle_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_int8.c index ca15469797..7aed4782db 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__isle_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_uint16.c index 6cfe009136..74875ace28 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__isle_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_uint32.c index 076865a178..955bc7f227 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__isle_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_uint64.c index 02052663ac..082b514a51 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__isle_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__isle_uint8.c index f663cc3d4c..d43ded6729 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isle_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isle_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isle_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isle_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isle_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__isle_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__isle_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__isle_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__islt_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_fp32.c index 387124dcb2..d4929d57c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__islt_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_fp64.c index e0902942c3..44149adae5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int16.c b/GraphBLAS/FactoryKernels/GB_ew__islt_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_int16.c index f4ff5e0284..accd2a089c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int32.c b/GraphBLAS/FactoryKernels/GB_ew__islt_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_int32.c index 564db1ecd4..f5eadc6930 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int64.c b/GraphBLAS/FactoryKernels/GB_ew__islt_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_int64.c index f4d6b3b2fd..bc697bfd71 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int8.c b/GraphBLAS/FactoryKernels/GB_ew__islt_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_int8.c index b6a402916c..e6635d7352 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__islt_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_uint16.c index 5727d9269d..60216a3ea7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__islt_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_uint32.c index f1ad97335b..7835aadc7d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__islt_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_uint64.c index d560b7cf20..86fcd14807 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__islt_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__islt_uint8.c index f5e4b0840d..f235d40d73 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__islt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__islt_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__islt_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__islt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__islt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__islt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__islt_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__islt_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__isne_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_fc32.c index 24c2fb93cb..a4fc36ed39 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_isne (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__isne_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__isne_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__isne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__isne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__isne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__isne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__isne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__isne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__isne_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__isne_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__isne_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_fc64.c index 90e1a5c303..27eb21e175 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_isne (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__isne_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__isne_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__isne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__isne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -222,7 +224,7 @@ GrB_Info GB (_AemultB_04__isne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_bitmap__isne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ GrB_Info GB (_bind1st__isne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -292,7 +294,7 @@ GrB_Info GB (_bind2nd__isne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -326,7 +328,7 @@ GrB_Info GB (_bind1st_tran__isne_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd_tran__isne_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__isne_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_fp32.c index 165805a1fc..16e65573bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__isne_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_fp64.c index 8c3a54420b..302548b548 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int16.c b/GraphBLAS/FactoryKernels/GB_ew__isne_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_int16.c index 79cc470479..fc193ea449 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int32.c b/GraphBLAS/FactoryKernels/GB_ew__isne_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_int32.c index 64662c9368..71e1873ca6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int64.c b/GraphBLAS/FactoryKernels/GB_ew__isne_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_int64.c index 529486c4c5..e9f80660da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int8.c b/GraphBLAS/FactoryKernels/GB_ew__isne_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_int8.c index 2dd30054e7..d2fc258e01 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__isne_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_uint16.c index ecd16e4d92..d401f4945c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__isne_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_uint32.c index 6fab4acf3b..0e72ac253a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__isne_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_uint64.c index d4b524843f..0f0fb0acc0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__isne_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__isne_uint8.c index 50f76cce10..ce1959819d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__isne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__isne_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__isne_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__isne_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__isne_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__isne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__isne_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__isne_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_bool.c b/GraphBLAS/FactoryKernels/GB_ew__land_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__land_bool.c index 3e13a30053..0458e9460e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) && (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__land_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__land_fp32.c index 071af6c087..c7e0c8d79e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__land_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__land_fp64.c index e1f564dd90..dc53821f52 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int16.c b/GraphBLAS/FactoryKernels/GB_ew__land_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__land_int16.c index 44d942cc75..e04bc07f58 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int32.c b/GraphBLAS/FactoryKernels/GB_ew__land_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__land_int32.c index 5b8d1992b2..99e237ddb5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int64.c b/GraphBLAS/FactoryKernels/GB_ew__land_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__land_int64.c index bddd257a24..123b886ceb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int8.c b/GraphBLAS/FactoryKernels/GB_ew__land_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__land_int8.c index 6389ad7183..059c87045b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__land_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__land_uint16.c index a5e0f61abc..be300ac94e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__land_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__land_uint32.c index 4f3cc19357..37b7c36049 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__land_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__land_uint64.c index 3ac681c66e..98b425c47e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__land_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__land_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__land_uint8.c index 5b57d822d6..e7146ab78e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__land_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__land_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) && ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__land_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__land_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__land_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__land_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__land_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__land_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ldexp_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__ldexp_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ldexp_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__ldexp_fp32.c index 9214fdccff..1299b81dad 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ldexp_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ldexp_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ldexpf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__ldexp_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__ldexp_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__ldexp_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__ldexp_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__ldexp_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__ldexp_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ldexp_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__ldexp_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ldexp_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__ldexp_fp64.c index f946c01479..9e72e70adc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ldexp_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ldexp_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ldexp (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__ldexp_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__ldexp_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__ldexp_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__ldexp_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__ldexp_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__ldexp_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_bool.c b/GraphBLAS/FactoryKernels/GB_ew__le_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__le_bool.c index 68f59dadd6..67eada093a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__le_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__le_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__le_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__le_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__le_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__le_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__le_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__le_fp32.c index 984ee5cfd8..3ccec71082 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__le_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__le_fp64.c index aed47a833e..fe3f2e3047 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int16.c b/GraphBLAS/FactoryKernels/GB_ew__le_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__le_int16.c index 5afc96ebdc..a242e3560c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int32.c b/GraphBLAS/FactoryKernels/GB_ew__le_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__le_int32.c index 29727e74a8..138a0efd9a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int64.c b/GraphBLAS/FactoryKernels/GB_ew__le_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__le_int64.c index 79bcc8c1c3..7e098157c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int8.c b/GraphBLAS/FactoryKernels/GB_ew__le_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__le_int8.c index 33cea40f5d..fd2022d4a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__le_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__le_uint16.c index e0c398ec85..43049f096d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__le_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__le_uint32.c index bed3896233..48456f5406 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__le_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__le_uint64.c index 6e38586dbf..62e69b78e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__le_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__le_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__le_uint8.c index 7c362d2d4a..6e365e4c1b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__le_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__le_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) <= (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__le_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__le_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__le_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__le_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__le_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__le_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_bool.c b/GraphBLAS/FactoryKernels/GB_ew__lor_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_bool.c index fe338b0969..4c6ff9d4af 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) || (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__lor_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_fp32.c index f7dc171a6a..fbbbb37574 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__lor_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_fp64.c index fb248cec0c..c347f10d9f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int16.c b/GraphBLAS/FactoryKernels/GB_ew__lor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_int16.c index fced7be029..043d5c0e63 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int32.c b/GraphBLAS/FactoryKernels/GB_ew__lor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_int32.c index e2784e35e8..b3a70ecf85 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int64.c b/GraphBLAS/FactoryKernels/GB_ew__lor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_int64.c index 5d30e52ea3..26084efb92 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int8.c b/GraphBLAS/FactoryKernels/GB_ew__lor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_int8.c index 32f7319164..85a2b0e035 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__lor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_uint16.c index e982f64068..01129bf85a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__lor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_uint32.c index de96cc5775..b3beafe422 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__lor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_uint64.c index 77183470a9..24e3ac754f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__lor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__lor_uint8.c index ef9d688b4a..67ce9e5b07 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lor_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) || ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lor_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lor_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lor_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_bool.c b/GraphBLAS/FactoryKernels/GB_ew__lt_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_bool.c index 2ba8e59f53..8879059cde 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lt_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lt_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lt_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -265,7 +267,7 @@ GrB_Info GB (_AemultB_03__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_04__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -316,7 +318,7 @@ GrB_Info GB (_AemultB_bitmap__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -338,7 +340,7 @@ GrB_Info GB (_bind1st__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -360,7 +362,7 @@ GrB_Info GB (_bind2nd__lt_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -394,7 +396,7 @@ GrB_Info GB (_bind1st_tran__lt_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -428,7 +430,7 @@ GrB_Info GB (_bind2nd_tran__lt_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__lt_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_fp32.c index e8480aa31d..9540f6b066 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__lt_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_fp64.c index 184d8a223d..ef397a9744 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int16.c b/GraphBLAS/FactoryKernels/GB_ew__lt_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_int16.c index 26caa9e666..40e5733731 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int32.c b/GraphBLAS/FactoryKernels/GB_ew__lt_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_int32.c index dc294d8694..ee5793403d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int64.c b/GraphBLAS/FactoryKernels/GB_ew__lt_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_int64.c index ffeeb90162..839f814ebf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int8.c b/GraphBLAS/FactoryKernels/GB_ew__lt_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_int8.c index 293826476b..59ac2367ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__lt_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_uint16.c index cede0599a4..743095709d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__lt_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_uint32.c index f4d8bfcb41..57fd276caf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__lt_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_uint64.c index 8dac2cb2b7..3a094fa2dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__lt_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__lt_uint8.c index 650a5f90d9..02e4d77ed9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lt_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lt_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) < (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__lt_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__lt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__lt_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -268,7 +270,7 @@ GrB_Info GB (_AemultB_03__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_04__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -319,7 +321,7 @@ GrB_Info GB (_AemultB_bitmap__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -341,7 +343,7 @@ GrB_Info GB (_bind1st__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -363,7 +365,7 @@ GrB_Info GB (_bind2nd__lt_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -397,7 +399,7 @@ GrB_Info GB (_bind1st_tran__lt_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -431,7 +433,7 @@ GrB_Info GB (_bind2nd_tran__lt_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_bool.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_bool.c index a2a8174a20..47b9b905bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_bool) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_bool) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_fp32.c index 16a948b671..46dfd4bbdc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_fp64.c index 5c4fdcc2d8..b0f31f8d1e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int16.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_int16.c index 28662436b9..564df8ab12 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int32.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_int32.c index 39c11205ce..6f959d0900 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int64.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_int64.c index 731464a085..d1ddb95baf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int8.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_int8.c index 85fc8acd3b..9e029b7647 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_uint16.c index e91522a38d..57c3dcc3ba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_uint32.c index 41d5b4fcee..a67038f630 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_uint64.c index 7bf08c092d..16ca8160a3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__lxor_uint8.c index df96f4e952..b5a50f8658 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__lxor_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__lxor_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (((x) != 0) != ((y) != 0)) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__lxor_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -75,7 +77,7 @@ GrB_Info GB (_AxD__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -95,7 +97,7 @@ GrB_Info GB (_DxB__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -138,7 +140,7 @@ GrB_Info GB (_AaddB__lxor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -185,7 +187,7 @@ GrB_Info GB (_AunionB__lxor_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -213,7 +215,7 @@ GrB_Info GB (_AemultB_08__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -239,7 +241,7 @@ GrB_Info GB (_AemultB_02__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_04__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -290,7 +292,7 @@ GrB_Info GB (_AemultB_bitmap__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -312,7 +314,7 @@ GrB_Info GB (_bind1st__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -334,7 +336,7 @@ GrB_Info GB (_bind2nd__lxor_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -368,7 +370,7 @@ GrB_Info GB (_bind1st_tran__lxor_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -402,7 +404,7 @@ GrB_Info GB (_bind2nd_tran__lxor_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__max_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__max_fp32.c index e7daa9b51f..91dd4c715c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = fmaxf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__max_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__max_fp64.c index 766ca5bd75..46e972fb7c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = fmax (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int16.c b/GraphBLAS/FactoryKernels/GB_ew__max_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__max_int16.c index 15b6946f11..0675234bde 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int32.c b/GraphBLAS/FactoryKernels/GB_ew__max_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__max_int32.c index 6a087592b8..f49bbb9f78 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int64.c b/GraphBLAS/FactoryKernels/GB_ew__max_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__max_int64.c index 3a7604c473..01444c9fd5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int8.c b/GraphBLAS/FactoryKernels/GB_ew__max_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__max_int8.c index bd9deb7531..64e817d846 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__max_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__max_uint16.c index c8eb52dd06..d3a77eaf15 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__max_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__max_uint32.c index 49f79d19f7..70245a6f3e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__max_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__max_uint64.c index a98d9a1b94..52253a12a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__max_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__max_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__max_uint8.c index 0e77b8b4aa..6e0c2d05cb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__max_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMAX (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__max_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__max_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__max_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__max_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__max_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__max_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__max_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__min_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__min_fp32.c index ac9b079011..2ce82b5edc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = fminf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__min_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__min_fp64.c index e747be6510..ff0741ce1d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = fmin (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int16.c b/GraphBLAS/FactoryKernels/GB_ew__min_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__min_int16.c index 21366f7152..de2c4a51e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int32.c b/GraphBLAS/FactoryKernels/GB_ew__min_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__min_int32.c index b98b6692b0..a215ea2bfb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int64.c b/GraphBLAS/FactoryKernels/GB_ew__min_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__min_int64.c index 107a0382a7..88bce293af 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int8.c b/GraphBLAS/FactoryKernels/GB_ew__min_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__min_int8.c index 860189156d..0bfc2af232 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__min_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__min_uint16.c index 669c50ab49..12af390e81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__min_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__min_uint32.c index 4e768c8a9a..ec1f4c25fa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__min_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__min_uint64.c index 53eee81aeb..e883817e3d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__min_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__min_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__min_uint8.c index 201d1b27d1..0502d1b9a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__min_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_IMIN (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__min_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__min_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__min_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__min_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__min_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__min_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__min_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__minus_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_fc32.c index 0069fd2cc4..1cfadfee3e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_minus (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_fc32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__minus_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_fc64.c index a2e353492c..efcf4e48c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_minus (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_fc64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__minus_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_fp32.c index 57c236e0cc..ee04b7dca9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__minus_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_fp64.c index c0fb239f57..6ec5c1b146 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int16.c b/GraphBLAS/FactoryKernels/GB_ew__minus_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_int16.c index aabd1bb5fb..a1413f17b3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int32.c b/GraphBLAS/FactoryKernels/GB_ew__minus_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_int32.c index 30c07ce510..c4e7e72b1f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int64.c b/GraphBLAS/FactoryKernels/GB_ew__minus_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_int64.c index 6e449cc904..50b34cf886 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int8.c b/GraphBLAS/FactoryKernels/GB_ew__minus_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_int8.c index 73f21a4195..673e6c33e7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__minus_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_uint16.c index f68534dfe0..d4ac997c98 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__minus_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_uint32.c index 8aa612df0c..b1f44a7e5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__minus_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_uint64.c index f15a964f36..afb956264c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__minus_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__minus_uint8.c index bae0e92a36..52e5e2ac8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__minus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__minus_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) - (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__minus_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__minus_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__minus_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__minus_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__minus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__minus_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__minus_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__ne_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_fc32.c index ef94eef011..d4643b0eb0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_ne (x, y) @@ -44,7 +46,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -58,7 +60,7 @@ GrB_Info GB (_Cewise_fulln__ne_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -100,7 +102,7 @@ GrB_Info GB (_AaddB__ne_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_AunionB__ne_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -175,7 +177,7 @@ GrB_Info GB (_AemultB_08__ne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_AemultB_02__ne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -226,7 +228,7 @@ GrB_Info GB (_AemultB_04__ne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -252,7 +254,7 @@ GrB_Info GB (_AemultB_bitmap__ne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_bind1st__ne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind2nd__ne_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -330,7 +332,7 @@ GrB_Info GB (_bind1st_tran__ne_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -364,7 +366,7 @@ GrB_Info GB (_bind2nd_tran__ne_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__ne_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_fc64.c index 5109db64c3..3614a0e701 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_ne (x, y) @@ -44,7 +46,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -58,7 +60,7 @@ GrB_Info GB (_Cewise_fulln__ne_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -100,7 +102,7 @@ GrB_Info GB (_AaddB__ne_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -147,7 +149,7 @@ GrB_Info GB (_AunionB__ne_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -175,7 +177,7 @@ GrB_Info GB (_AemultB_08__ne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -201,7 +203,7 @@ GrB_Info GB (_AemultB_02__ne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -226,7 +228,7 @@ GrB_Info GB (_AemultB_04__ne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -252,7 +254,7 @@ GrB_Info GB (_AemultB_bitmap__ne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_bind1st__ne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind2nd__ne_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -330,7 +332,7 @@ GrB_Info GB (_bind1st_tran__ne_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -364,7 +366,7 @@ GrB_Info GB (_bind2nd_tran__ne_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__ne_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_fp32.c index be1b137dfc..ab3d23e055 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__ne_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_fp64.c index bc4c66f1f9..26c637a01f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int16.c b/GraphBLAS/FactoryKernels/GB_ew__ne_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_int16.c index 6e51bb72ae..81b7591d8d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int32.c b/GraphBLAS/FactoryKernels/GB_ew__ne_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_int32.c index 08998f4d6d..6ecc8fe6e9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int64.c b/GraphBLAS/FactoryKernels/GB_ew__ne_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_int64.c index 8683ae0954..df6f7ce339 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int8.c b/GraphBLAS/FactoryKernels/GB_ew__ne_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_int8.c index ada043dd72..76a50b000c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__ne_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_uint16.c index 07a0a0bcf5..dfe66cc560 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__ne_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_uint32.c index 0483cad592..683f7b2e03 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__ne_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_uint64.c index ae82b27986..9ddabaf29d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__ne_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__ne_uint8.c index 5796ba4852..7f2a0ec4ce 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__ne_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__ne_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = ((x) != (y)) @@ -43,7 +45,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulln__ne_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -78,7 +80,7 @@ GrB_Info GB (_AxD__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -98,7 +100,7 @@ GrB_Info GB (_DxB__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -141,7 +143,7 @@ GrB_Info GB (_AaddB__ne_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -188,7 +190,7 @@ GrB_Info GB (_AunionB__ne_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -216,7 +218,7 @@ GrB_Info GB (_AemultB_08__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -242,7 +244,7 @@ GrB_Info GB (_AemultB_02__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -267,7 +269,7 @@ GrB_Info GB (_AemultB_04__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -293,7 +295,7 @@ GrB_Info GB (_AemultB_bitmap__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -315,7 +317,7 @@ GrB_Info GB (_bind1st__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -337,7 +339,7 @@ GrB_Info GB (_bind2nd__ne_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -371,7 +373,7 @@ GrB_Info GB (_bind1st_tran__ne_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -405,7 +407,7 @@ GrB_Info GB (_bind2nd_tran__ne_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_bool.c b/GraphBLAS/FactoryKernels/GB_ew__pair_bool.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_bool.c index 2a264b0c3f..508544158c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__pair_fc32.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_fc32.c index 12a69bf708..754cff5b13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GxB_CMPLXF(1,0) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__pair_fc64.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_fc64.c index 9830d60e67..2cfbc416f6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GxB_CMPLX(1,0) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__pair_fp32.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_fp32.c index 277ccb4768..cfc56cdf6a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__pair_fp64.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_fp64.c index b88838650d..e2522fdabb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int16.c b/GraphBLAS/FactoryKernels/GB_ew__pair_int16.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_int16.c index b664f86045..0181f2ab65 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int32.c b/GraphBLAS/FactoryKernels/GB_ew__pair_int32.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_int32.c index ab079e9001..8d4723ec8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int64.c b/GraphBLAS/FactoryKernels/GB_ew__pair_int64.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_int64.c index 64edecfb06..2e0b62ae8f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int8.c b/GraphBLAS/FactoryKernels/GB_ew__pair_int8.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_int8.c index ca14be6f9e..3398d38a01 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__pair_uint16.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_uint16.c index 7e422ba0cb..934edc5c17 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__pair_uint32.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_uint32.c index 1767d4c4de..e7d6f85aef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__pair_uint64.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_uint64.c index 1d6e36b86a..6d07f208db 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__pair_uint8.c similarity index 88% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__pair_uint8.c index 1e0e3edde3..6a331271d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pair_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pair_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = 1 @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pair_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pair_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__plus_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_fc32.c index c79fc4b182..392fdc983e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_add (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_fc32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__plus_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_fc64.c index 1c70de35de..994092db75 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_add (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_fc64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__plus_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_fp32.c index f45c71cf57..1019f4a036 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__plus_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_fp64.c index 3a0e9da716..d34b674f82 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int16.c b/GraphBLAS/FactoryKernels/GB_ew__plus_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_int16.c index 6a502034f4..b729ea7764 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int32.c b/GraphBLAS/FactoryKernels/GB_ew__plus_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_int32.c index 02bf82ba53..4f637c657c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int64.c b/GraphBLAS/FactoryKernels/GB_ew__plus_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_int64.c index e5a2c7581c..f101db5b74 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int8.c b/GraphBLAS/FactoryKernels/GB_ew__plus_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_int8.c index 49f2bca0b6..87424c25b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__plus_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_uint16.c index 34d2b28ad5..1a68a7e019 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__plus_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_uint32.c index 076e38b548..89c795f91e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__plus_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_uint64.c index 7aee540af6..c9c0f0fb81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__plus_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__plus_uint8.c index 30067becbd..c7cbbddda4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__plus_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) + (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__plus_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__plus_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__plus_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__plus_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__plus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__plus_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__plus_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__pow_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_fc32.c index ce5ba65a71..594b61704b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_pow (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__pow_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_fc64.c index 57abc367e7..03ad8465d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_pow (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__pow_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_fp32.c index e9622d5b5f..97fee78874 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_powf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__pow_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_fp64.c index 5fc76a61cd..da01e0b8ab 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int16.c b/GraphBLAS/FactoryKernels/GB_ew__pow_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_int16.c index 7840d563d6..ea9ef7b09b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_int16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int32.c b/GraphBLAS/FactoryKernels/GB_ew__pow_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_int32.c index 31ac8385e1..b33f1e33f9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_int32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int64.c b/GraphBLAS/FactoryKernels/GB_ew__pow_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_int64.c index 67563eda5b..081f22316e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_int64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int8.c b/GraphBLAS/FactoryKernels/GB_ew__pow_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_int8.c index 865c25e342..b258a86572 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_int8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__pow_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_uint16.c index dd108ba366..3db538d00a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_uint16 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__pow_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_uint32.c index 4d6f588a3b..4a573d0d68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_uint32 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__pow_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_uint64.c index c4796a2e72..f5c0254750 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_uint64 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__pow_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__pow_uint8.c index 9e1aef34b4..702d623a49 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__pow_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__pow_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_pow_uint8 (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__pow_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__pow_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__pow_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__pow_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__pow_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__pow_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_fc32.c index a7db1c43c3..12797658b7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_div (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_fc32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_fc64.c index 16a8078f79..251abd2d59 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_div (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_fc64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_fp32.c index 049cc2c43b..61bad7802e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) / (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_fp64.c index 14fa74ade5..b22f306b35 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) / (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int16.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_int16.c index fdcb5128b1..2bb2ee6309 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int16 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int32.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_int32.c index e3f8faaacf..12e6317962 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int32 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int64.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_int64.c index 384ecd4c04..245e8885d8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int64 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int8.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_int8.c index 254d342cae..88a876c5d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_int8 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_uint16.c index d34140e579..510bf980e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint16 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_uint32.c index 27e145a7cc..8519cd0e6e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint32 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_uint64.c index 02fa6cbab6..621d7b7d0d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint64 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__rdiv_uint8.c index 155b810a1d..80f4723db6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rdiv_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rdiv_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_idiv_uint8 (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rdiv_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rdiv_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rdiv_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rdiv_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rdiv_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rdiv_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rdiv_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__remainder_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__remainder_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__remainder_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__remainder_fp32.c index 0290b36bb0..13e761ff28 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__remainder_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__remainder_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = remainderf (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__remainder_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__remainder_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__remainder_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__remainder_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__remainder_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__remainder_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__remainder_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__remainder_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__remainder_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__remainder_fp64.c index 8182a64d7e..033356efd5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__remainder_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__remainder_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = remainder (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -54,7 +56,7 @@ GrB_Info GB (_Cewise_fulln__remainder_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -96,7 +98,7 @@ GrB_Info GB (_AaddB__remainder_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -143,7 +145,7 @@ GrB_Info GB (_AunionB__remainder_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ GrB_Info GB (_AemultB_08__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -197,7 +199,7 @@ GrB_Info GB (_AemultB_02__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -223,7 +225,7 @@ GrB_Info GB (_AemultB_03__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -248,7 +250,7 @@ GrB_Info GB (_AemultB_04__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -274,7 +276,7 @@ GrB_Info GB (_AemultB_bitmap__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -296,7 +298,7 @@ GrB_Info GB (_bind1st__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -318,7 +320,7 @@ GrB_Info GB (_bind2nd__remainder_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -352,7 +354,7 @@ GrB_Info GB (_bind1st_tran__remainder_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -386,7 +388,7 @@ GrB_Info GB (_bind2nd_tran__remainder_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_fc32.c index 35a85da2f3..a7450607dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_minus (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_fc32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_fc64.c index 63935ec2a1..06825aa953 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_minus (y, x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_fc64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_fp32.c index 2a960a307d..d8b606e1c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_fp64.c index e5658cd441..a94d5f6f85 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int16.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_int16.c index 5a21f75384..653de0d2a7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int32.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_int32.c index 7bd47be2c5..a2f0778982 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int64.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_int64.c index 9f427f250d..ed4de041ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int8.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_int8.c index ab8935a4d6..3ff87f65bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_uint16.c index c982241050..cf241981f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_uint32.c index 5c785e6426..fdf1db5c1a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_uint64.c index b55cdd7c2e..f5ce079021 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__rminus_uint8.c index 69fb4ad96a..4b7cb0dc0f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__rminus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__rminus_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (y) - (x) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__rminus_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__rminus_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__rminus_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__rminus_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -284,7 +286,7 @@ GrB_Info GB (_AemultB_03__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_04__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -335,7 +337,7 @@ GrB_Info GB (_AemultB_bitmap__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -357,7 +359,7 @@ GrB_Info GB (_bind1st__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -379,7 +381,7 @@ GrB_Info GB (_bind2nd__rminus_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -413,7 +415,7 @@ GrB_Info GB (_bind1st_tran__rminus_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -447,7 +449,7 @@ GrB_Info GB (_bind2nd_tran__rminus_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_bool.c b/GraphBLAS/FactoryKernels/GB_ew__second_bool.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_bool.c rename to GraphBLAS/FactoryKernels/GB_ew__second_bool.c index bd4ebafcc3..fe4d7c7a22 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_bool.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_bool.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_bool) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_bool) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__second_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__second_fc32.c index 88d07fa1c0..2b8113e520 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__second_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__second_fc64.c index fc027bfd05..ccab979506 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__second_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__second_fp32.c index b279725c22..1b7db399aa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__second_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__second_fp64.c index c410e44f18..6d900b8db6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int16.c b/GraphBLAS/FactoryKernels/GB_ew__second_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__second_int16.c index e2c0a9ffda..58c56e4971 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int32.c b/GraphBLAS/FactoryKernels/GB_ew__second_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__second_int32.c index 8e67f7c689..93f6284059 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int64.c b/GraphBLAS/FactoryKernels/GB_ew__second_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__second_int64.c index f924a7d1cf..b3a266d271 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int8.c b/GraphBLAS/FactoryKernels/GB_ew__second_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__second_int8.c index 9e57f94a3c..ca3ef399d6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__second_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__second_uint16.c index f1efaa64d5..186bcb608b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__second_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__second_uint32.c index a7474e1f98..66e83f744a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__second_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__second_uint64.c index 9fdf9d4539..69b1ff6ef6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__second_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__second_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__second_uint8.c index 31289db992..9af19421f6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__second_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__second_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = y @@ -41,7 +43,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C = A+B, all 3 matrices dense @@ -55,7 +57,7 @@ GrB_Info GB (_Cewise_fulln__second_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -76,7 +78,7 @@ GrB_Info GB (_AxD__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -96,7 +98,7 @@ GrB_Info GB (_DxB__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -139,7 +141,7 @@ GrB_Info GB (_AaddB__second_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -186,7 +188,7 @@ GrB_Info GB (_AunionB__second_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -214,7 +216,7 @@ GrB_Info GB (_AemultB_08__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -240,7 +242,7 @@ GrB_Info GB (_AemultB_02__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -266,7 +268,7 @@ GrB_Info GB (_AemultB_03__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_04__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_bitmap__second_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fc32.c b/GraphBLAS/FactoryKernels/GB_ew__times_fc32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_fc32.c rename to GraphBLAS/FactoryKernels/GB_ew__times_fc32.c index bfb09500b0..c63f899584 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_fc32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC32_mul (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_fc32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_fc32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_fc32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_fc32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_fc32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fc64.c b/GraphBLAS/FactoryKernels/GB_ew__times_fc64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_fc64.c rename to GraphBLAS/FactoryKernels/GB_ew__times_fc64.c index 8fda0134ca..a00ee2083f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_fc64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = GB_FC64_mul (x, y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_fc64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_fc64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_fc64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_fc64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_fc64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fp32.c b/GraphBLAS/FactoryKernels/GB_ew__times_fp32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_fp32.c rename to GraphBLAS/FactoryKernels/GB_ew__times_fp32.c index bf6f34dfb4..05129d2bb2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_fp32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_fp32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_fp32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_fp32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_fp32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_fp32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fp64.c b/GraphBLAS/FactoryKernels/GB_ew__times_fp64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_fp64.c rename to GraphBLAS/FactoryKernels/GB_ew__times_fp64.c index 44837d809a..64e6848147 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_fp64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_fp64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_fp64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_fp64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_fp64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_fp64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int16.c b/GraphBLAS/FactoryKernels/GB_ew__times_int16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_int16.c rename to GraphBLAS/FactoryKernels/GB_ew__times_int16.c index 88aae543d2..8464eb522d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_int16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_int16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_int16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_int16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_int16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_int16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int32.c b/GraphBLAS/FactoryKernels/GB_ew__times_int32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_int32.c rename to GraphBLAS/FactoryKernels/GB_ew__times_int32.c index 9a8508b8eb..f46691a6f2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_int32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_int32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_int32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_int32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_int32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_int32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int64.c b/GraphBLAS/FactoryKernels/GB_ew__times_int64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_int64.c rename to GraphBLAS/FactoryKernels/GB_ew__times_int64.c index 7c02ffd0fd..628987cba7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_int64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_int64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_int64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_int64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_int64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_int64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int8.c b/GraphBLAS/FactoryKernels/GB_ew__times_int8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_int8.c rename to GraphBLAS/FactoryKernels/GB_ew__times_int8.c index c5c53cbd3d..561121037c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_int8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_int8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_int8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_int8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_int8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_int8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint16.c b/GraphBLAS/FactoryKernels/GB_ew__times_uint16.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_uint16.c rename to GraphBLAS/FactoryKernels/GB_ew__times_uint16.c index 25e6807418..798b50fd65 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_uint16.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_uint16) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_uint16) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_uint16) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_uint16) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_uint16) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint32.c b/GraphBLAS/FactoryKernels/GB_ew__times_uint32.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_uint32.c rename to GraphBLAS/FactoryKernels/GB_ew__times_uint32.c index afacd18063..ebb591c059 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_uint32.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_uint32) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_uint32) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_uint32) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_uint32) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_uint32) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint64.c b/GraphBLAS/FactoryKernels/GB_ew__times_uint64.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_uint64.c rename to GraphBLAS/FactoryKernels/GB_ew__times_uint64.c index 9715878a90..edc3b76dc6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_uint64.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_uint64) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_uint64) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_uint64) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_uint64) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_uint64) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint8.c b/GraphBLAS/FactoryKernels/GB_ew__times_uint8.c similarity index 91% rename from GraphBLAS/Source/FactoryKernels/GB_ew__times_uint8.c rename to GraphBLAS/FactoryKernels/GB_ew__times_uint8.c index e0076c2a6a..35fb46ea7d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_ew__times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_ew__times_uint8.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: #define GB_BINOP(z,x,y,i,j) z = (x) * (y) @@ -40,7 +42,7 @@ #define GB_DISABLE 0 #endif -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" //------------------------------------------------------------------------------ // C += A+B, all 3 matrices dense @@ -57,7 +59,7 @@ GrB_Info GB (_Cewise_fulla__times_uint8) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } @@ -73,7 +75,7 @@ GrB_Info GB (_Cewise_fulln__times_uint8) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -94,7 +96,7 @@ GrB_Info GB (_AxD__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -114,7 +116,7 @@ GrB_Info GB (_DxB__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -157,7 +159,7 @@ GrB_Info GB (_AaddB__times_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -204,7 +206,7 @@ GrB_Info GB (_AunionB__times_uint8) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -232,7 +234,7 @@ GrB_Info GB (_AemultB_08__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -258,7 +260,7 @@ GrB_Info GB (_AemultB_02__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -283,7 +285,7 @@ GrB_Info GB (_AemultB_04__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -309,7 +311,7 @@ GrB_Info GB (_AemultB_bitmap__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -331,7 +333,7 @@ GrB_Info GB (_bind1st__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -353,7 +355,7 @@ GrB_Info GB (_bind2nd__times_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -387,7 +389,7 @@ GrB_Info GB (_bind1st_tran__times_uint8) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -421,7 +423,7 @@ GrB_Info GB (_bind2nd_tran__times_uint8) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_bool.c b/GraphBLAS/FactoryKernels/GB_red__any_bool.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_bool.c rename to GraphBLAS/FactoryKernels/GB_red__any_bool.c index 14b7cae747..0bb03e8b4d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_bool.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_bool.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_bool) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_fc32.c b/GraphBLAS/FactoryKernels/GB_red__any_fc32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_fc32.c rename to GraphBLAS/FactoryKernels/GB_red__any_fc32.c index c87137166a..fcf4057ce0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_fc32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_fc32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_fc64.c b/GraphBLAS/FactoryKernels/GB_red__any_fc64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_fc64.c rename to GraphBLAS/FactoryKernels/GB_red__any_fc64.c index f90b4cccc3..a4028df2e6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_fc64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_fc64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_fp32.c b/GraphBLAS/FactoryKernels/GB_red__any_fp32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_fp32.c rename to GraphBLAS/FactoryKernels/GB_red__any_fp32.c index 2603927976..7750821dee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_fp32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_fp32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_fp64.c b/GraphBLAS/FactoryKernels/GB_red__any_fp64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_fp64.c rename to GraphBLAS/FactoryKernels/GB_red__any_fp64.c index f555b3d7cc..c8106d1716 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_fp64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_fp64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_int16.c b/GraphBLAS/FactoryKernels/GB_red__any_int16.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_int16.c rename to GraphBLAS/FactoryKernels/GB_red__any_int16.c index 0fff5f3d62..0a1fff127d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_int16.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_int16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_int16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_int32.c b/GraphBLAS/FactoryKernels/GB_red__any_int32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_int32.c rename to GraphBLAS/FactoryKernels/GB_red__any_int32.c index 7c17384a33..73c3b81110 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_int32.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_int32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_int32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_int64.c b/GraphBLAS/FactoryKernels/GB_red__any_int64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_int64.c rename to GraphBLAS/FactoryKernels/GB_red__any_int64.c index 8edf935ab7..26525c5df0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_int64.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_int64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_int64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_int8.c b/GraphBLAS/FactoryKernels/GB_red__any_int8.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_int8.c rename to GraphBLAS/FactoryKernels/GB_red__any_int8.c index 8bb010c46c..ada4947b69 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_int8.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_int8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_int8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint16.c b/GraphBLAS/FactoryKernels/GB_red__any_uint16.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_uint16.c rename to GraphBLAS/FactoryKernels/GB_red__any_uint16.c index ce8484d777..30be696c9d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_uint16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_uint16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint32.c b/GraphBLAS/FactoryKernels/GB_red__any_uint32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_uint32.c rename to GraphBLAS/FactoryKernels/GB_red__any_uint32.c index fa883ed3ab..1f8586135b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_uint32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_uint32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint64.c b/GraphBLAS/FactoryKernels/GB_red__any_uint64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_uint64.c rename to GraphBLAS/FactoryKernels/GB_red__any_uint64.c index 1c63d9db54..b4fc6041da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_uint64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_uint64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint8.c b/GraphBLAS/FactoryKernels/GB_red__any_uint8.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__any_uint8.c rename to GraphBLAS/FactoryKernels/GB_red__any_uint8.c index 55393389a8..0b7bd1ed50 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__any_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_red__any_uint8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = a @@ -37,7 +37,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red__any_uint8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__eq_bool.c b/GraphBLAS/FactoryKernels/GB_red__eq_bool.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__eq_bool.c rename to GraphBLAS/FactoryKernels/GB_red__eq_bool.c index 0a2a76a7cb..8c65c9b109 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__eq_bool.c +++ b/GraphBLAS/FactoryKernels/GB_red__eq_bool.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = (z == a) @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__eq_bool) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__include.h b/GraphBLAS/FactoryKernels/GB_red__include.h similarity index 99% rename from GraphBLAS/Source/FactoryKernels/GB_red__include.h rename to GraphBLAS/FactoryKernels/GB_red__include.h index ac6b8122b1..3564ccc169 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__include.h +++ b/GraphBLAS/FactoryKernels/GB_red__include.h @@ -2,11 +2,11 @@ // GB_red__include.h: definitions for GB_red__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_red.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_red__min_int8) ( diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__land_bool.c b/GraphBLAS/FactoryKernels/GB_red__land_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__land_bool.c rename to GraphBLAS/FactoryKernels/GB_red__land_bool.c index befce4c3a5..3c14d987da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__land_bool.c +++ b/GraphBLAS/FactoryKernels/GB_red__land_bool.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = (z && a) @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__land_bool) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__lor_bool.c b/GraphBLAS/FactoryKernels/GB_red__lor_bool.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__lor_bool.c rename to GraphBLAS/FactoryKernels/GB_red__lor_bool.c index 652fa228a4..f998792b9b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__lor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_red__lor_bool.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = (z || a) @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__lor_bool) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__lxor_bool.c b/GraphBLAS/FactoryKernels/GB_red__lxor_bool.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__lxor_bool.c rename to GraphBLAS/FactoryKernels/GB_red__lxor_bool.c index aa12471f06..aa7f5b56a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__lxor_bool.c +++ b/GraphBLAS/FactoryKernels/GB_red__lxor_bool.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = (z != a) @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__lxor_bool) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_fp32.c b/GraphBLAS/FactoryKernels/GB_red__max_fp32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_fp32.c rename to GraphBLAS/FactoryKernels/GB_red__max_fp32.c index 4a2403cae9..b45d8ecdf8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_fp32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if ((a > z) || (z != z)) { z = a ; } @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__max_fp32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_fp64.c b/GraphBLAS/FactoryKernels/GB_red__max_fp64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_fp64.c rename to GraphBLAS/FactoryKernels/GB_red__max_fp64.c index d48533c7f2..3e3257a145 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_fp64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if ((a > z) || (z != z)) { z = a ; } @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__max_fp64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_int16.c b/GraphBLAS/FactoryKernels/GB_red__max_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_int16.c rename to GraphBLAS/FactoryKernels/GB_red__max_int16.c index bc3408d3db..966f6ff40b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_int16.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_int16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_int16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_int32.c b/GraphBLAS/FactoryKernels/GB_red__max_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_int32.c rename to GraphBLAS/FactoryKernels/GB_red__max_int32.c index 5b2a333018..1a7c9768c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_int32.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_int32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_int32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_int64.c b/GraphBLAS/FactoryKernels/GB_red__max_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_int64.c rename to GraphBLAS/FactoryKernels/GB_red__max_int64.c index 50a35c0b88..caae74374f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_int64.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_int64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_int64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_int8.c b/GraphBLAS/FactoryKernels/GB_red__max_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_int8.c rename to GraphBLAS/FactoryKernels/GB_red__max_int8.c index ef25d6b6ab..5fa0e1291d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_int8.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_int8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_int8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint16.c b/GraphBLAS/FactoryKernels/GB_red__max_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_uint16.c rename to GraphBLAS/FactoryKernels/GB_red__max_uint16.c index cee1d2366c..3d59a748b3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_uint16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_uint16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint32.c b/GraphBLAS/FactoryKernels/GB_red__max_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_uint32.c rename to GraphBLAS/FactoryKernels/GB_red__max_uint32.c index 33876eb220..be96c26084 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_uint32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_uint32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint64.c b/GraphBLAS/FactoryKernels/GB_red__max_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_uint64.c rename to GraphBLAS/FactoryKernels/GB_red__max_uint64.c index 7a5e9308fc..f3df8b96c3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_uint64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_uint64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint8.c b/GraphBLAS/FactoryKernels/GB_red__max_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__max_uint8.c rename to GraphBLAS/FactoryKernels/GB_red__max_uint8.c index 0525f860f8..b41e2f0661 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__max_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_red__max_uint8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a > z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__max_uint8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_fp32.c b/GraphBLAS/FactoryKernels/GB_red__min_fp32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_fp32.c rename to GraphBLAS/FactoryKernels/GB_red__min_fp32.c index 90cbb71783..d9dc3406c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_fp32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if ((a < z) || (z != z)) { z = a ; } @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__min_fp32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_fp64.c b/GraphBLAS/FactoryKernels/GB_red__min_fp64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_fp64.c rename to GraphBLAS/FactoryKernels/GB_red__min_fp64.c index 1a217258d4..801691b11d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_fp64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if ((a < z) || (z != z)) { z = a ; } @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__min_fp64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_int16.c b/GraphBLAS/FactoryKernels/GB_red__min_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_int16.c rename to GraphBLAS/FactoryKernels/GB_red__min_int16.c index 405c8bc508..18dbf14bcd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_int16.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_int16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_int16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_int32.c b/GraphBLAS/FactoryKernels/GB_red__min_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_int32.c rename to GraphBLAS/FactoryKernels/GB_red__min_int32.c index 8b174acd84..3465e9428e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_int32.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_int32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_int32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_int64.c b/GraphBLAS/FactoryKernels/GB_red__min_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_int64.c rename to GraphBLAS/FactoryKernels/GB_red__min_int64.c index 88cb82b58f..fe4921e9f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_int64.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_int64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_int64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_int8.c b/GraphBLAS/FactoryKernels/GB_red__min_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_int8.c rename to GraphBLAS/FactoryKernels/GB_red__min_int8.c index 68db5e92e0..bb5f152d27 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_int8.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_int8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_int8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint16.c b/GraphBLAS/FactoryKernels/GB_red__min_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_uint16.c rename to GraphBLAS/FactoryKernels/GB_red__min_uint16.c index 970cfd86bd..f024db5589 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_uint16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_uint16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint32.c b/GraphBLAS/FactoryKernels/GB_red__min_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_uint32.c rename to GraphBLAS/FactoryKernels/GB_red__min_uint32.c index 6a4a59de67..5098c3f5b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_uint32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_uint32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint64.c b/GraphBLAS/FactoryKernels/GB_red__min_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_uint64.c rename to GraphBLAS/FactoryKernels/GB_red__min_uint64.c index 986e9f5d28..f5deee39ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_uint64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_uint64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint8.c b/GraphBLAS/FactoryKernels/GB_red__min_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__min_uint8.c rename to GraphBLAS/FactoryKernels/GB_red__min_uint8.c index b0d199b536..3fc7e85953 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__min_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_red__min_uint8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) if (a < z) { z = a ; } @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__min_uint8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fc32.c b/GraphBLAS/FactoryKernels/GB_red__plus_fc32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_fc32.c rename to GraphBLAS/FactoryKernels/GB_red__plus_fc32.c index d2a88d6e38..c1a3e67953 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_fc32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = GB_FC32_add (z, a) @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_fc32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fc64.c b/GraphBLAS/FactoryKernels/GB_red__plus_fc64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_fc64.c rename to GraphBLAS/FactoryKernels/GB_red__plus_fc64.c index be1e75403d..b38556ec48 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_fc64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = GB_FC64_add (z, a) @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_fc64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fp32.c b/GraphBLAS/FactoryKernels/GB_red__plus_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_fp32.c rename to GraphBLAS/FactoryKernels/GB_red__plus_fp32.c index de00275b2f..d8adcbe94d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_fp32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_fp32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fp64.c b/GraphBLAS/FactoryKernels/GB_red__plus_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_fp64.c rename to GraphBLAS/FactoryKernels/GB_red__plus_fp64.c index 59c45ded29..e3e4546ac3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_fp64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_fp64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int16.c b/GraphBLAS/FactoryKernels/GB_red__plus_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_int16.c rename to GraphBLAS/FactoryKernels/GB_red__plus_int16.c index 0bd491fa43..c6c2b6ebef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int16.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_int16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_int16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int32.c b/GraphBLAS/FactoryKernels/GB_red__plus_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_int32.c rename to GraphBLAS/FactoryKernels/GB_red__plus_int32.c index cafc7d6730..50202e0278 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int32.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_int32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_int32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int64.c b/GraphBLAS/FactoryKernels/GB_red__plus_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_int64.c rename to GraphBLAS/FactoryKernels/GB_red__plus_int64.c index ca69ec7af0..4a619e9db2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int64.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_int64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_int64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int8.c b/GraphBLAS/FactoryKernels/GB_red__plus_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_int8.c rename to GraphBLAS/FactoryKernels/GB_red__plus_int8.c index 951da03bb7..99e0eecdbe 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_int8.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_int8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_int8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint16.c b/GraphBLAS/FactoryKernels/GB_red__plus_uint16.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_uint16.c rename to GraphBLAS/FactoryKernels/GB_red__plus_uint16.c index 0e04c149bb..a9a539f679 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_uint16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_uint16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint32.c b/GraphBLAS/FactoryKernels/GB_red__plus_uint32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_uint32.c rename to GraphBLAS/FactoryKernels/GB_red__plus_uint32.c index d519c47f3a..77cdb6f768 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_uint32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_uint32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint64.c b/GraphBLAS/FactoryKernels/GB_red__plus_uint64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_uint64.c rename to GraphBLAS/FactoryKernels/GB_red__plus_uint64.c index c395c506ca..4db081b7c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_uint64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_uint64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint8.c b/GraphBLAS/FactoryKernels/GB_red__plus_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__plus_uint8.c rename to GraphBLAS/FactoryKernels/GB_red__plus_uint8.c index 02e0e5d68b..7ab5464a7a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__plus_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_red__plus_uint8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z += a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__plus_uint8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_fc32.c b/GraphBLAS/FactoryKernels/GB_red__times_fc32.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_fc32.c rename to GraphBLAS/FactoryKernels/GB_red__times_fc32.c index 5419343c74..c2cc4da5fa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_fc32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = GB_FC32_mul (z, a) @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__times_fc32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_fc64.c b/GraphBLAS/FactoryKernels/GB_red__times_fc64.c similarity index 85% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_fc64.c rename to GraphBLAS/FactoryKernels/GB_red__times_fc64.c index 8a23e9aa8b..dd108920e1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_fc64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z = GB_FC64_mul (z, a) @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__times_fc64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_fp32.c b/GraphBLAS/FactoryKernels/GB_red__times_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_fp32.c rename to GraphBLAS/FactoryKernels/GB_red__times_fp32.c index 86e871a4e2..4f933e247d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_fp32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__times_fp32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_fp64.c b/GraphBLAS/FactoryKernels/GB_red__times_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_fp64.c rename to GraphBLAS/FactoryKernels/GB_red__times_fp64.c index 9dcdaee2a1..b5df94f8c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_fp64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -36,7 +36,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -59,11 +59,11 @@ GrB_Info GB (_red__times_fp64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_int16.c b/GraphBLAS/FactoryKernels/GB_red__times_int16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_int16.c rename to GraphBLAS/FactoryKernels/GB_red__times_int16.c index 371b609a60..86d8e3eb21 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_int16.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_int16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_int16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_int32.c b/GraphBLAS/FactoryKernels/GB_red__times_int32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_int32.c rename to GraphBLAS/FactoryKernels/GB_red__times_int32.c index 046874c408..07269dc2be 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_int32.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_int32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_int32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_int64.c b/GraphBLAS/FactoryKernels/GB_red__times_int64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_int64.c rename to GraphBLAS/FactoryKernels/GB_red__times_int64.c index dfe08c07f8..103cf3cdcd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_int64.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_int64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_int64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_int8.c b/GraphBLAS/FactoryKernels/GB_red__times_int8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_int8.c rename to GraphBLAS/FactoryKernels/GB_red__times_int8.c index a56d956b31..b088eccf78 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_int8.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_int8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_int8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint16.c b/GraphBLAS/FactoryKernels/GB_red__times_uint16.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_uint16.c rename to GraphBLAS/FactoryKernels/GB_red__times_uint16.c index cccceeb87a..1f2261fee6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_uint16.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_uint16) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint32.c b/GraphBLAS/FactoryKernels/GB_red__times_uint32.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_uint32.c rename to GraphBLAS/FactoryKernels/GB_red__times_uint32.c index dbb529b996..5e5252857d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_uint32.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_uint32) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint64.c b/GraphBLAS/FactoryKernels/GB_red__times_uint64.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_uint64.c rename to GraphBLAS/FactoryKernels/GB_red__times_uint64.c index e90a24b0c4..8e57ce67ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_uint64.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_uint64) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint8.c b/GraphBLAS/FactoryKernels/GB_red__times_uint8.c similarity index 86% rename from GraphBLAS/Source/FactoryKernels/GB_red__times_uint8.c rename to GraphBLAS/FactoryKernels/GB_red__times_uint8.c index a38ddbc802..cb77803ff0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_red__times_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_red__times_uint8.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: #define GB_UPDATE(z,a) z *= a @@ -41,7 +41,7 @@ #define GB_DISABLE 0 #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -64,11 +64,11 @@ GrB_Info GB (_red__times_uint8) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_bool.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_bool.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_bool.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_bool.c index 0387f408ab..a30e536e3b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_bool.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_bool.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE bool @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_bool) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_bool) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_bool) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fc32.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fc32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fc32.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fc32.c index 935db3d54f..a15c76078a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fc32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE GxB_FC32_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_fc32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_fc32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_fc32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fc64.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fc64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fc64.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fc64.c index 26b3d00209..c0055fc337 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fc64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE GxB_FC64_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_fc64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_fc64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_fc64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fp32.c index a83d5b39b5..787173df77 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fp64.c index 7f73668172..5353b04718 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int16.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int16.c index 2a4820bc56..b696ce81c2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int32.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int32.c index 897f796a92..823c2ac0ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int64.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int64.c index 146d000f67..a861212ef7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int8.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int8.c index de1c9f98a5..0b28262821 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint16.c index 2bff277a86..6299acab0d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint32.c index 4139c534f2..f668ada330 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint64.c index 0251d1834d..6c59557e13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint8.c index b8f9a80cd9..c8f46a50f1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__eq_thunk_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__eq_thunk_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -18,7 +18,7 @@ #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) #define GB_ISO_SELECT 1 -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -37,7 +37,7 @@ GrB_Info GB (_sel_phase1__eq_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -60,7 +60,7 @@ GrB_Info GB (_sel_phase2__eq_thunk_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -78,7 +78,7 @@ GrB_Info GB (_sel_bitmap__eq_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_fp32.c index 99940a64f2..8114a910e4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_fp64.c index a60fc3bef8..e36770d377 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int16.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int16.c index 62be3f2f3f..cf7caf30e1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int32.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int32.c index d31d36b03b..4328dbe8b4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int64.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int64.c index 9e7096f5ea..1de5138de5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int8.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int8.c index b9c4e57e17..a369f6a562 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint16.c index 252820d713..de6d8f9164 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint32.c index 7c14c489f2..e2b6e6aa2d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint64.c index bda37b5684..5b8c00ef4d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint8.c index c1ecd325e2..0efdb9bcff 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ge_thunk_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ge_thunk_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] >= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ge_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ge_thunk_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ge_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_fp32.c index c60de5d4a1..0cf2076990 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_fp64.c index 7f7776275f..c24d9e35c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int16.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int16.c index 9248ca8238..7289ef3617 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int32.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int32.c index 71dbf33ec6..35dec7242f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int64.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int64.c index 8273f653ab..82c8cd1d6b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int8.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int8.c index 7ea2c478fa..ddb2336ee4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint16.c index 3491da8899..896290ae5c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint32.c index 5abb3fd5b8..95c4545a70 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint64.c index ee8eaf598d..c9fc55e8b3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint8.c index e870db985c..a5504d87fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__gt_thunk_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__gt_thunk_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] > y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__gt_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__gt_thunk_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__gt_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__include.h b/GraphBLAS/FactoryKernels/GB_sel__include.h similarity index 99% rename from GraphBLAS/Source/FactoryKernels/GB_sel__include.h rename to GraphBLAS/FactoryKernels/GB_sel__include.h index c495c3f5e9..483a0ff945 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__include.h +++ b/GraphBLAS/FactoryKernels/GB_sel__include.h @@ -2,11 +2,11 @@ // GB_sel__include.h: definitions for GB_sel__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_sel.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_sel_phase2__nonzombie_bool) diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_fp32.c index c0bdb51a44..498cab4d84 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_fp64.c index e0fb7b7457..40fc4fcdff 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int16.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_int16.c index d6bedc26e3..9a7b3d6619 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int32.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_int32.c index 7a561656d7..aa678b0b26 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int64.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_int64.c index cbc1070802..38548c47da 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int8.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_int8.c index a3a18fc26a..a570f2c359 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint16.c index c460924ea3..d162a35a46 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint32.c index 39f3c7571b..0c6d2f47ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint64.c index 650b66867c..a60e96e2ca 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint8.c index bfcd1705ac..baefa8f03b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__le_thunk_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__le_thunk_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] <= y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__le_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__le_thunk_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__le_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_fp32.c index 848410f605..264d08bfe1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_fp64.c index 16d82a6f50..807311ee9f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int16.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int16.c index 5f2be9333a..e10ff22a60 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int32.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int32.c index 57bbf259a5..91fa342629 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int64.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int64.c index f5b685ea0d..d5ab4fb370 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int8.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int8.c index c2e1ffeec3..180d51c0cc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint16.c index 28f7ad9bcd..c5085ffbec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint32.c index 870e76235e..560d530103 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint64.c index e8b6fc265f..d8a4707ee5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint8.c index ec49f8c6a4..ec35e6e2a3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__lt_thunk_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__lt_thunk_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] < y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__lt_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__lt_thunk_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__lt_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fc32.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fc32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fc32.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fc32.c index d94975de8f..eb032b8da8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fc32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE GxB_FC32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = GB_FC32_ne (Ax [p], y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_fc32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_fc32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_fc32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fc64.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fc64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fc64.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fc64.c index 71616a0c6a..dd961b94ba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fc64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE GxB_FC64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = GB_FC64_ne (Ax [p], y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_fc64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_fc64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_fc64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fp32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fp32.c index 4cade88354..27c81837cd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_fp32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fp64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fp64.c index 930aa1bb54..ab4dcc2395 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_fp64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int16.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int16.c index ee76c0642e..5cf22d3209 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_int16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int32.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int32.c index 538ce49a2a..12dc282877 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_int32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int64.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int64.c index fa395a01e5..ee1a6c59a4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_int64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int8.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int8.c index 87f1aa545d..d295b6ff5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_int8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint16.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint16.c index 514318c754..6958363979 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_uint16) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint32.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint32.c index 0dac6d872c..93c830f3b3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_uint32) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint64.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint64.c index 731a502b3e..0f3f026e92 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_uint64) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint8.c similarity index 84% rename from GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint8.c index af28b14c8e..1db5e0d85a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__ne_thunk_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__ne_thunk_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (Ax [p] != y) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase1 @@ -36,7 +36,7 @@ GrB_Info GB (_sel_phase1__ne_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -59,7 +59,7 @@ GrB_Info GB (_sel_phase2__ne_thunk_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -77,7 +77,7 @@ GrB_Info GB (_sel_bitmap__ne_thunk_uint8) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_bool.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_bool.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_bool.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_bool.c index 970994437a..53b5a7f215 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_bool.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_bool.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE bool @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_bool) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fc32.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fc32.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_fc32.c index 421638c776..46b170d1d4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fc32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE GxB_FC32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_fc32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fc64.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fc64.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_fc64.c index b1a6732dd3..e0549a9074 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fc64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE GxB_FC64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_fc64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fp32.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fp32.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fp32.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_fp32.c index f38a62970e..690aae29b2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fp32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE float @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_fp32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fp64.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fp64.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fp64.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_fp64.c index f14dcf4a63..bd9b748367 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_fp64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE double @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_fp64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int16.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int16.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_int16.c index 27e82ee244..8c12dee73e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_int16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int32.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int32.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_int32.c index 370b6df0cb..b47d616627 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_int32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int64.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int64.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_int64.c index b263324b78..bd23d0db36 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_int64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int8.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int8.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int8.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_int8.c index f88754da5b..3baaedc301 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_int8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_int8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE int8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_int8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint16.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint16.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint16.c index 6a91f167ae..7005b3ee5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint16.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint16_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_uint16) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint32.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint32.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint32.c index 46413a2020..4be80bd48a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint32.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint32_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_uint32) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint64.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint64.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint64.c index a8ef8a9d3f..02c1f17380 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint64.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint64_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_uint64) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint8.c b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint8.c rename to GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint8.c index 6ed25dbac5..dcdfd2bda6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_sel__nonzombie_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_sel__nonzombie_uint8.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR #define GB_A_TYPE uint8_t @@ -17,7 +17,7 @@ #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) Cx [pC] = Ax [pA] -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" //------------------------------------------------------------------------------ // GB_sel_phase2 @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase2__nonzombie_uint8) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_bool_bool.c b/GraphBLAS/FactoryKernels/GB_uop__abs_bool_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_bool_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_bool_bool.c index ef2882f8b2..6427d04390 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_bool_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_bool_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_bool_bool) +GrB_Info GB (_uop_apply__abs_bool_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_bool_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_bool_bool) +GrB_Info GB (_uop_tran__abs_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__abs_fp32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_fp32_fc32.c index 6a9859c432..984e89d7fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_fp32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cabsf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_fp32_fc32) +GrB_Info GB (_uop_apply__abs_fp32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_fp32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_fp32_fc32) +GrB_Info GB (_uop_tran__abs_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__abs_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_fp32_fp32.c index 6f2778e65d..f7953a1af5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = fabsf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_fp32_fp32) +GrB_Info GB (_uop_apply__abs_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_fp32_fp32) +GrB_Info GB (_uop_tran__abs_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__abs_fp64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_fp64_fc64.c index 3743fd4d08..369329351d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_fp64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cabs (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_fp64_fc64) +GrB_Info GB (_uop_apply__abs_fp64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_fp64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_fp64_fc64) +GrB_Info GB (_uop_tran__abs_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__abs_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_fp64_fp64.c index 2afca0ecc2..9103a630f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = fabs (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_fp64_fp64) +GrB_Info GB (_uop_apply__abs_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_fp64_fp64) +GrB_Info GB (_uop_tran__abs_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__abs_int16_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_int16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_int16_int16.c index 25d98da1a2..b6124b4e84 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_int16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_IABS (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_int16_int16) +GrB_Info GB (_uop_apply__abs_int16_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_int16_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_int16_int16) +GrB_Info GB (_uop_tran__abs_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__abs_int32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_int32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_int32_int32.c index 7ac44893c8..07395e314d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_int32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_IABS (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_int32_int32) +GrB_Info GB (_uop_apply__abs_int32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_int32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_int32_int32) +GrB_Info GB (_uop_tran__abs_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__abs_int64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_int64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_int64_int64.c index 59c39d848d..98ea469b4a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_int64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_IABS (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_int64_int64) +GrB_Info GB (_uop_apply__abs_int64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_int64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_int64_int64) +GrB_Info GB (_uop_tran__abs_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__abs_int8_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_int8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_int8_int8.c index de06be0db2..c9d3b2e95f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_int8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_int8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_IABS (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_int8_int8) +GrB_Info GB (_uop_apply__abs_int8_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_int8_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_int8_int8) +GrB_Info GB (_uop_tran__abs_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__abs_uint16_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_uint16_uint16.c index 8e562f15c2..9390168f5f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_uint16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_uint16_uint16) +GrB_Info GB (_uop_apply__abs_uint16_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_uint16_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_uint16_uint16) +GrB_Info GB (_uop_tran__abs_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__abs_uint32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_uint32_uint32.c index 320710abf7..39424aa260 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_uint32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_uint32_uint32) +GrB_Info GB (_uop_apply__abs_uint32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_uint32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_uint32_uint32) +GrB_Info GB (_uop_tran__abs_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__abs_uint64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_uint64_uint64.c index 676b538763..af9d16f9e5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_uint64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_uint64_uint64) +GrB_Info GB (_uop_apply__abs_uint64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_uint64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_uint64_uint64) +GrB_Info GB (_uop_tran__abs_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__abs_uint8_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__abs_uint8_uint8.c index 5f7ab5f3fa..ea410f9e54 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__abs_uint8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__abs_uint8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__abs_uint8_uint8) +GrB_Info GB (_uop_apply__abs_uint8_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__abs_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__abs_uint8_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__abs_uint8_uint8) +GrB_Info GB (_uop_tran__abs_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__abs_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__acos_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acos_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__acos_fc32_fc32.c index 6ee6b8a5ec..365597aec9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acos_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cacosf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acos_fc32_fc32) +GrB_Info GB (_uop_apply__acos_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acos_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acos_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acos_fc32_fc32) +GrB_Info GB (_uop_tran__acos_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acos_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__acos_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acos_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__acos_fc64_fc64.c index 663ec6e020..c60807a52f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acos_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cacos (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acos_fc64_fc64) +GrB_Info GB (_uop_apply__acos_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acos_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acos_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acos_fc64_fc64) +GrB_Info GB (_uop_tran__acos_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acos_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__acos_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acos_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__acos_fp32_fp32.c index 9e9b2b1be5..5c59eaa518 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acos_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = acosf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acos_fp32_fp32) +GrB_Info GB (_uop_apply__acos_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acos_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acos_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acos_fp32_fp32) +GrB_Info GB (_uop_tran__acos_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acos_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__acos_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acos_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__acos_fp64_fp64.c index 576f0a0446..871a501e3c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acos_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acos_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = acos (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acos_fp64_fp64) +GrB_Info GB (_uop_apply__acos_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acos_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acos_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acos_fp64_fp64) +GrB_Info GB (_uop_tran__acos_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acos_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__acosh_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__acosh_fc32_fc32.c index 5d1dab8468..d02ecb7cb8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acosh_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cacoshf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acosh_fc32_fc32) +GrB_Info GB (_uop_apply__acosh_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acosh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acosh_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acosh_fc32_fc32) +GrB_Info GB (_uop_tran__acosh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acosh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__acosh_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__acosh_fc64_fc64.c index 66f81d4bdf..aaa6216964 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acosh_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cacosh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acosh_fc64_fc64) +GrB_Info GB (_uop_apply__acosh_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acosh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acosh_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acosh_fc64_fc64) +GrB_Info GB (_uop_tran__acosh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acosh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__acosh_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__acosh_fp32_fp32.c index 7e20a421e9..f5d4ecf851 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acosh_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = acoshf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acosh_fp32_fp32) +GrB_Info GB (_uop_apply__acosh_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acosh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acosh_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acosh_fp32_fp32) +GrB_Info GB (_uop_tran__acosh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acosh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__acosh_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__acosh_fp64_fp64.c index 23a3d019af..72611b693b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__acosh_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__acosh_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = acosh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__acosh_fp64_fp64) +GrB_Info GB (_uop_apply__acosh_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__acosh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__acosh_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__acosh_fp64_fp64) +GrB_Info GB (_uop_tran__acosh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__acosh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_bool_bool.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_bool_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_bool_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_bool_bool.c index 63c6a824cc..bfe3da1a19 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_bool_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_bool_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_bool_bool) +GrB_Info GB (_uop_apply__ainv_bool_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_bool_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_bool_bool) +GrB_Info GB (_uop_tran__ainv_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_fc32_fc32.c index 882c8c59f9..45a04a6a74 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_FC32_ainv (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_fc32_fc32) +GrB_Info GB (_uop_apply__ainv_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_fc32_fc32) +GrB_Info GB (_uop_tran__ainv_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_fc64_fc64.c index 5ac87e1a5d..59c6488632 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_FC64_ainv (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_fc64_fc64) +GrB_Info GB (_uop_apply__ainv_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_fc64_fc64) +GrB_Info GB (_uop_tran__ainv_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_fp32_fp32.c index 7e9c7254a3..a8017e771b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_fp32_fp32) +GrB_Info GB (_uop_apply__ainv_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_fp32_fp32) +GrB_Info GB (_uop_tran__ainv_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_fp64_fp64.c index a0ca9c1587..2ece74f193 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_fp64_fp64) +GrB_Info GB (_uop_apply__ainv_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_fp64_fp64) +GrB_Info GB (_uop_tran__ainv_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_int16_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_int16_int16.c index 5d0578d721..2ae8151d0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_int16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_int16_int16) +GrB_Info GB (_uop_apply__ainv_int16_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_int16_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_int16_int16) +GrB_Info GB (_uop_tran__ainv_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_int32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_int32_int32.c index abd5e8cb46..323bd7e3a8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_int32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_int32_int32) +GrB_Info GB (_uop_apply__ainv_int32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_int32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_int32_int32) +GrB_Info GB (_uop_tran__ainv_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_int64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_int64_int64.c index 6dcb67c1b5..1bd6cde5fc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_int64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_int64_int64) +GrB_Info GB (_uop_apply__ainv_int64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_int64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_int64_int64) +GrB_Info GB (_uop_tran__ainv_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_int8_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_int8_int8.c index b747093650..7edc93dd17 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_int8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_int8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_int8_int8) +GrB_Info GB (_uop_apply__ainv_int8_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_int8_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_int8_int8) +GrB_Info GB (_uop_tran__ainv_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint16_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_uint16_uint16.c index 25f7476314..b9585687a8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_uint16_uint16) +GrB_Info GB (_uop_apply__ainv_uint16_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_uint16_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_uint16_uint16) +GrB_Info GB (_uop_tran__ainv_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_uint32_uint32.c index 6150c38a41..f58ee62954 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_uint32_uint32) +GrB_Info GB (_uop_apply__ainv_uint32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_uint32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_uint32_uint32) +GrB_Info GB (_uop_tran__ainv_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_uint64_uint64.c index c3ee6df25a..37ccf90fa2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_uint64_uint64) +GrB_Info GB (_uop_apply__ainv_uint64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_uint64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_uint64_uint64) +GrB_Info GB (_uop_tran__ainv_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint8_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__ainv_uint8_uint8.c index cf42cb0be4..95b65d3872 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ainv_uint8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ainv_uint8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = -x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ainv_uint8_uint8) +GrB_Info GB (_uop_apply__ainv_uint8_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ainv_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ainv_uint8_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ainv_uint8_uint8) +GrB_Info GB (_uop_tran__ainv_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ainv_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__asin_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asin_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__asin_fc32_fc32.c index 8ddc6844c5..af7cc3abb9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asin_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_casinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asin_fc32_fc32) +GrB_Info GB (_uop_apply__asin_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asin_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asin_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asin_fc32_fc32) +GrB_Info GB (_uop_tran__asin_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asin_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__asin_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asin_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__asin_fc64_fc64.c index 36785991aa..1eb300dd35 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asin_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_casin (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asin_fc64_fc64) +GrB_Info GB (_uop_apply__asin_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asin_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asin_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asin_fc64_fc64) +GrB_Info GB (_uop_tran__asin_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asin_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__asin_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asin_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__asin_fp32_fp32.c index ccd31c2bc4..2cf6e2b315 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asin_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = asinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asin_fp32_fp32) +GrB_Info GB (_uop_apply__asin_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asin_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asin_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asin_fp32_fp32) +GrB_Info GB (_uop_tran__asin_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asin_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__asin_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asin_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__asin_fp64_fp64.c index 4b7c6d727f..7bb66e6eef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asin_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asin_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = asin (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asin_fp64_fp64) +GrB_Info GB (_uop_apply__asin_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asin_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asin_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asin_fp64_fp64) +GrB_Info GB (_uop_tran__asin_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asin_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__asinh_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__asinh_fc32_fc32.c index 81ead14399..1ef02cf208 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asinh_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_casinhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asinh_fc32_fc32) +GrB_Info GB (_uop_apply__asinh_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asinh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asinh_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asinh_fc32_fc32) +GrB_Info GB (_uop_tran__asinh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asinh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__asinh_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__asinh_fc64_fc64.c index 44208d9573..c7ba30ad93 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asinh_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_casinh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asinh_fc64_fc64) +GrB_Info GB (_uop_apply__asinh_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asinh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asinh_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asinh_fc64_fc64) +GrB_Info GB (_uop_tran__asinh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asinh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__asinh_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__asinh_fp32_fp32.c index 61b99f48d8..927d4aaab6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asinh_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = asinhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asinh_fp32_fp32) +GrB_Info GB (_uop_apply__asinh_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asinh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asinh_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asinh_fp32_fp32) +GrB_Info GB (_uop_tran__asinh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asinh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__asinh_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__asinh_fp64_fp64.c index eae038d2af..4f3e1fe1d6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__asinh_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__asinh_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = asinh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__asinh_fp64_fp64) +GrB_Info GB (_uop_apply__asinh_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__asinh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__asinh_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__asinh_fp64_fp64) +GrB_Info GB (_uop_tran__asinh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__asinh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__atan_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atan_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__atan_fc32_fc32.c index ef72512901..b06ed9131e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atan_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_catanf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atan_fc32_fc32) +GrB_Info GB (_uop_apply__atan_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atan_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atan_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atan_fc32_fc32) +GrB_Info GB (_uop_tran__atan_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atan_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__atan_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atan_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__atan_fc64_fc64.c index 1c33e0065e..469a6b407e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atan_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_catan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atan_fc64_fc64) +GrB_Info GB (_uop_apply__atan_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atan_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atan_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atan_fc64_fc64) +GrB_Info GB (_uop_tran__atan_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atan_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__atan_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atan_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__atan_fp32_fp32.c index 274240b1c2..048f5277df 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atan_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = atanf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atan_fp32_fp32) +GrB_Info GB (_uop_apply__atan_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atan_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atan_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atan_fp32_fp32) +GrB_Info GB (_uop_tran__atan_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atan_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__atan_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atan_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__atan_fp64_fp64.c index 57cf2db08c..65c5f7063c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atan_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atan_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = atan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atan_fp64_fp64) +GrB_Info GB (_uop_apply__atan_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atan_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atan_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atan_fp64_fp64) +GrB_Info GB (_uop_tran__atan_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atan_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__atanh_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__atanh_fc32_fc32.c index addd62e292..50d4dba6cc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atanh_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_catanhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atanh_fc32_fc32) +GrB_Info GB (_uop_apply__atanh_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atanh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atanh_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atanh_fc32_fc32) +GrB_Info GB (_uop_tran__atanh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atanh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__atanh_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__atanh_fc64_fc64.c index 244b3ee1de..6dc4788aea 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atanh_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_catanh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atanh_fc64_fc64) +GrB_Info GB (_uop_apply__atanh_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atanh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atanh_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atanh_fc64_fc64) +GrB_Info GB (_uop_tran__atanh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atanh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__atanh_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__atanh_fp32_fp32.c index a615cc6f5b..2d9c92309e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atanh_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = atanhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atanh_fp32_fp32) +GrB_Info GB (_uop_apply__atanh_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atanh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atanh_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atanh_fp32_fp32) +GrB_Info GB (_uop_tran__atanh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atanh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__atanh_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__atanh_fp64_fp64.c index de2c1dc654..1f97af7331 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__atanh_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__atanh_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = atanh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__atanh_fp64_fp64) +GrB_Info GB (_uop_apply__atanh_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__atanh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__atanh_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__atanh_fp64_fp64) +GrB_Info GB (_uop_tran__atanh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__atanh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_int16_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_int16_int16.c index d8c034da39..9cd07ca5cd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_int16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_int16_int16) +GrB_Info GB (_uop_apply__bnot_int16_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_int16_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_int16_int16) +GrB_Info GB (_uop_tran__bnot_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_int32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_int32_int32.c index a64bbd2214..8e43bb1695 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_int32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_int32_int32) +GrB_Info GB (_uop_apply__bnot_int32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_int32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_int32_int32) +GrB_Info GB (_uop_tran__bnot_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_int64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_int64_int64.c index e40035e59e..1cf99ee29b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_int64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_int64_int64) +GrB_Info GB (_uop_apply__bnot_int64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_int64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_int64_int64) +GrB_Info GB (_uop_tran__bnot_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_int8_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_int8_int8.c index 22abbfa6df..e8ad0cf7e4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_int8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_int8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_int8_int8) +GrB_Info GB (_uop_apply__bnot_int8_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_int8_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_int8_int8) +GrB_Info GB (_uop_tran__bnot_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint16_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_uint16_uint16.c index 152087b94e..624f64c468 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_uint16_uint16) +GrB_Info GB (_uop_apply__bnot_uint16_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_uint16_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_uint16_uint16) +GrB_Info GB (_uop_tran__bnot_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_uint32_uint32.c index 28413a4796..8fb669ce70 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_uint32_uint32) +GrB_Info GB (_uop_apply__bnot_uint32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_uint32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_uint32_uint32) +GrB_Info GB (_uop_tran__bnot_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_uint64_uint64.c index 1e6fdebe40..e6c08dfbec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_uint64_uint64) +GrB_Info GB (_uop_apply__bnot_uint64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_uint64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_uint64_uint64) +GrB_Info GB (_uop_tran__bnot_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint8_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__bnot_uint8_uint8.c index caf6431590..8c8c201bd1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__bnot_uint8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__bnot_uint8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ~(x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__bnot_uint8_uint8) +GrB_Info GB (_uop_apply__bnot_uint8_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__bnot_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__bnot_uint8_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__bnot_uint8_uint8) +GrB_Info GB (_uop_tran__bnot_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__bnot_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__carg_fp32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__carg_fp32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__carg_fp32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__carg_fp32_fc32.c index ad988812ac..302db10dff 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__carg_fp32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__carg_fp32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cargf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__carg_fp32_fc32) +GrB_Info GB (_uop_apply__carg_fp32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__carg_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__carg_fp32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__carg_fp32_fc32) +GrB_Info GB (_uop_tran__carg_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__carg_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__carg_fp64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__carg_fp64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__carg_fp64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__carg_fp64_fc64.c index 7ae3ae805b..3825ee34dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__carg_fp64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__carg_fp64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_carg (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__carg_fp64_fc64) +GrB_Info GB (_uop_apply__carg_fp64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__carg_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__carg_fp64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__carg_fp64_fc64) +GrB_Info GB (_uop_tran__carg_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__carg_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cbrt_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__cbrt_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cbrt_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__cbrt_fp32_fp32.c index b0e3cdffa9..ac9228eee6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cbrt_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cbrt_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = cbrtf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cbrt_fp32_fp32) +GrB_Info GB (_uop_apply__cbrt_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cbrt_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cbrt_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cbrt_fp32_fp32) +GrB_Info GB (_uop_tran__cbrt_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cbrt_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cbrt_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__cbrt_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cbrt_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__cbrt_fp64_fp64.c index 6251199629..a94862b84f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cbrt_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cbrt_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = cbrt (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cbrt_fp64_fp64) +GrB_Info GB (_uop_apply__cbrt_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cbrt_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cbrt_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cbrt_fp64_fp64) +GrB_Info GB (_uop_tran__cbrt_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cbrt_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__ceil_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__ceil_fc32_fc32.c index 2b5266f875..22ee325db4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ceil_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cceilf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ceil_fc32_fc32) +GrB_Info GB (_uop_apply__ceil_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ceil_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ceil_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ceil_fc32_fc32) +GrB_Info GB (_uop_tran__ceil_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ceil_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__ceil_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__ceil_fc64_fc64.c index 44896875fe..eeff39ff9f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ceil_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cceil (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ceil_fc64_fc64) +GrB_Info GB (_uop_apply__ceil_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ceil_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ceil_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ceil_fc64_fc64) +GrB_Info GB (_uop_tran__ceil_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ceil_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__ceil_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__ceil_fp32_fp32.c index f6d0466db1..a3e5dc062b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ceil_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ceilf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ceil_fp32_fp32) +GrB_Info GB (_uop_apply__ceil_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ceil_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ceil_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ceil_fp32_fp32) +GrB_Info GB (_uop_tran__ceil_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ceil_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__ceil_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__ceil_fp64_fp64.c index b6357bb5f0..b83cfeeadc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__ceil_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__ceil_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = ceil (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__ceil_fp64_fp64) +GrB_Info GB (_uop_apply__ceil_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__ceil_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__ceil_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__ceil_fp64_fp64) +GrB_Info GB (_uop_tran__ceil_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__ceil_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cimag_fp32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__cimag_fp32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cimag_fp32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__cimag_fp32_fc32.c index f272fe021f..3560736991 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cimag_fp32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cimag_fp32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cimagf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cimag_fp32_fc32) +GrB_Info GB (_uop_apply__cimag_fp32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cimag_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cimag_fp32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cimag_fp32_fc32) +GrB_Info GB (_uop_tran__cimag_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cimag_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cimag_fp64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__cimag_fp64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cimag_fp64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__cimag_fp64_fc64.c index 66672a1b39..069d222f60 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cimag_fp64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cimag_fp64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cimag (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cimag_fp64_fc64) +GrB_Info GB (_uop_apply__cimag_fp64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cimag_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cimag_fp64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cimag_fp64_fc64) +GrB_Info GB (_uop_tran__cimag_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cimag_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__conj_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__conj_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__conj_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__conj_fc32_fc32.c index c0e57fd47e..b3f03609c0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__conj_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__conj_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_conjf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__conj_fc32_fc32) +GrB_Info GB (_uop_apply__conj_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__conj_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__conj_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__conj_fc32_fc32) +GrB_Info GB (_uop_tran__conj_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__conj_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__conj_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__conj_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__conj_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__conj_fc64_fc64.c index ad7a59920c..cc7b7515bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__conj_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__conj_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_conj (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__conj_fc64_fc64) +GrB_Info GB (_uop_apply__conj_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__conj_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__conj_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__conj_fc64_fc64) +GrB_Info GB (_uop_tran__conj_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__conj_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__cos_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cos_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__cos_fc32_fc32.c index eaa6799786..1cafa32a10 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cos_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ccosf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cos_fc32_fc32) +GrB_Info GB (_uop_apply__cos_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cos_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cos_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cos_fc32_fc32) +GrB_Info GB (_uop_tran__cos_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cos_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__cos_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cos_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__cos_fc64_fc64.c index 74e907ebd4..7de3e656c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cos_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ccos (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cos_fc64_fc64) +GrB_Info GB (_uop_apply__cos_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cos_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cos_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cos_fc64_fc64) +GrB_Info GB (_uop_tran__cos_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cos_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__cos_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cos_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__cos_fp32_fp32.c index 4bf511b2ac..0b89b3aeae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cos_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = cosf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cos_fp32_fp32) +GrB_Info GB (_uop_apply__cos_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cos_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cos_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cos_fp32_fp32) +GrB_Info GB (_uop_tran__cos_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cos_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__cos_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cos_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__cos_fp64_fp64.c index 2d8d710b5b..b7aa7bddb6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cos_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cos_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = cos (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cos_fp64_fp64) +GrB_Info GB (_uop_apply__cos_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cos_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cos_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cos_fp64_fp64) +GrB_Info GB (_uop_tran__cos_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cos_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__cosh_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__cosh_fc32_fc32.c index 5a8385e3dd..cf92ea5f67 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cosh_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ccoshf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cosh_fc32_fc32) +GrB_Info GB (_uop_apply__cosh_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cosh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cosh_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cosh_fc32_fc32) +GrB_Info GB (_uop_tran__cosh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cosh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__cosh_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__cosh_fc64_fc64.c index 7a53e177f2..03160131d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cosh_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ccosh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cosh_fc64_fc64) +GrB_Info GB (_uop_apply__cosh_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cosh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cosh_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cosh_fc64_fc64) +GrB_Info GB (_uop_tran__cosh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cosh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__cosh_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__cosh_fp32_fp32.c index b8538df9ec..3cca7399a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cosh_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = coshf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cosh_fp32_fp32) +GrB_Info GB (_uop_apply__cosh_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cosh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cosh_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cosh_fp32_fp32) +GrB_Info GB (_uop_tran__cosh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cosh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__cosh_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__cosh_fp64_fp64.c index c90d0ac990..650d81e361 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__cosh_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__cosh_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = cosh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__cosh_fp64_fp64) +GrB_Info GB (_uop_apply__cosh_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__cosh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__cosh_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__cosh_fp64_fp64) +GrB_Info GB (_uop_tran__cosh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__cosh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__creal_fp32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__creal_fp32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__creal_fp32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__creal_fp32_fc32.c index a67160178c..1f37ed7c4e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__creal_fp32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__creal_fp32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_crealf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__creal_fp32_fc32) +GrB_Info GB (_uop_apply__creal_fp32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__creal_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__creal_fp32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__creal_fp32_fc32) +GrB_Info GB (_uop_tran__creal_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__creal_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__creal_fp64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__creal_fp64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__creal_fp64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__creal_fp64_fc64.c index e83f8d9aa2..f6dc29b4f7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__creal_fp64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__creal_fp64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_creal (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__creal_fp64_fc64) +GrB_Info GB (_uop_apply__creal_fp64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__creal_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__creal_fp64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__creal_fp64_fc64) +GrB_Info GB (_uop_tran__creal_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__creal_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__erf_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__erf_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__erf_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__erf_fp32_fp32.c index 9fde826c16..87e03c55e5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__erf_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__erf_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = erff (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__erf_fp32_fp32) +GrB_Info GB (_uop_apply__erf_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__erf_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__erf_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__erf_fp32_fp32) +GrB_Info GB (_uop_tran__erf_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__erf_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__erf_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__erf_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__erf_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__erf_fp64_fp64.c index 5e0ff913a4..a13c4e736a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__erf_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__erf_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = erf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__erf_fp64_fp64) +GrB_Info GB (_uop_apply__erf_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__erf_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__erf_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__erf_fp64_fp64) +GrB_Info GB (_uop_tran__erf_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__erf_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__erfc_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__erfc_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__erfc_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__erfc_fp32_fp32.c index 4df21ee9d2..e0a7fcb981 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__erfc_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__erfc_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = erfcf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__erfc_fp32_fp32) +GrB_Info GB (_uop_apply__erfc_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__erfc_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__erfc_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__erfc_fp32_fp32) +GrB_Info GB (_uop_tran__erfc_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__erfc_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__erfc_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__erfc_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__erfc_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__erfc_fp64_fp64.c index 02a9609fac..33dc237d48 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__erfc_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__erfc_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = erfc (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__erfc_fp64_fp64) +GrB_Info GB (_uop_apply__erfc_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__erfc_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__erfc_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__erfc_fp64_fp64) +GrB_Info GB (_uop_tran__erfc_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__erfc_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__exp2_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__exp2_fc32_fc32.c index 596895bbc7..4cda8e723d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp2_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cexp2f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp2_fc32_fc32) +GrB_Info GB (_uop_apply__exp2_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp2_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp2_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp2_fc32_fc32) +GrB_Info GB (_uop_tran__exp2_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp2_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__exp2_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__exp2_fc64_fc64.c index b676467941..c3db51bbb3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp2_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cexp2 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp2_fc64_fc64) +GrB_Info GB (_uop_apply__exp2_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp2_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp2_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp2_fc64_fc64) +GrB_Info GB (_uop_tran__exp2_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp2_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__exp2_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__exp2_fp32_fp32.c index 4d0b5c059e..8aa88e1f90 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp2_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = exp2f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp2_fp32_fp32) +GrB_Info GB (_uop_apply__exp2_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp2_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp2_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp2_fp32_fp32) +GrB_Info GB (_uop_tran__exp2_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp2_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__exp2_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__exp2_fp64_fp64.c index 06cccb0713..aeb7501be8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp2_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp2_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = exp2 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp2_fp64_fp64) +GrB_Info GB (_uop_apply__exp2_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp2_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp2_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp2_fp64_fp64) +GrB_Info GB (_uop_tran__exp2_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp2_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__exp_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__exp_fc32_fc32.c index 6cddfdfba1..ed1c33be23 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cexpf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp_fc32_fc32) +GrB_Info GB (_uop_apply__exp_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp_fc32_fc32) +GrB_Info GB (_uop_tran__exp_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__exp_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__exp_fc64_fc64.c index a1d31cd3f5..0b1b7428db 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cexp (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp_fc64_fc64) +GrB_Info GB (_uop_apply__exp_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp_fc64_fc64) +GrB_Info GB (_uop_tran__exp_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__exp_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__exp_fp32_fp32.c index 8d3c82fea5..3fcbc3b8fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = expf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp_fp32_fp32) +GrB_Info GB (_uop_apply__exp_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp_fp32_fp32) +GrB_Info GB (_uop_tran__exp_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__exp_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__exp_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__exp_fp64_fp64.c index d6118339af..22aac398e3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__exp_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__exp_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = exp (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__exp_fp64_fp64) +GrB_Info GB (_uop_apply__exp_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__exp_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__exp_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__exp_fp64_fp64) +GrB_Info GB (_uop_tran__exp_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__exp_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__expm1_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__expm1_fc32_fc32.c index aea7106ee5..df3b1fbe68 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__expm1_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cexpm1f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__expm1_fc32_fc32) +GrB_Info GB (_uop_apply__expm1_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__expm1_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__expm1_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__expm1_fc32_fc32) +GrB_Info GB (_uop_tran__expm1_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__expm1_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__expm1_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__expm1_fc64_fc64.c index 12b1cbeb37..554e21a1a0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__expm1_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cexpm1 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__expm1_fc64_fc64) +GrB_Info GB (_uop_apply__expm1_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__expm1_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__expm1_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__expm1_fc64_fc64) +GrB_Info GB (_uop_tran__expm1_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__expm1_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__expm1_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__expm1_fp32_fp32.c index 601ffd5656..3b9e5484ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__expm1_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = expm1f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__expm1_fp32_fp32) +GrB_Info GB (_uop_apply__expm1_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__expm1_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__expm1_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__expm1_fp32_fp32) +GrB_Info GB (_uop_tran__expm1_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__expm1_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__expm1_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__expm1_fp64_fp64.c index 7f1448b721..ed552b2d5e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__expm1_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__expm1_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = expm1 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__expm1_fp64_fp64) +GrB_Info GB (_uop_apply__expm1_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__expm1_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__expm1_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__expm1_fp64_fp64) +GrB_Info GB (_uop_tran__expm1_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__expm1_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__floor_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__floor_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__floor_fc32_fc32.c index e5201014a0..78851ee78d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__floor_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cfloorf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__floor_fc32_fc32) +GrB_Info GB (_uop_apply__floor_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__floor_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__floor_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__floor_fc32_fc32) +GrB_Info GB (_uop_tran__floor_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__floor_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__floor_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__floor_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__floor_fc64_fc64.c index fe7d230b73..b62f95c976 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__floor_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cfloor (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__floor_fc64_fc64) +GrB_Info GB (_uop_apply__floor_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__floor_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__floor_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__floor_fc64_fc64) +GrB_Info GB (_uop_tran__floor_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__floor_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__floor_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__floor_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__floor_fp32_fp32.c index 665dab203f..4ad0fcd2b5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__floor_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = floorf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__floor_fp32_fp32) +GrB_Info GB (_uop_apply__floor_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__floor_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__floor_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__floor_fp32_fp32) +GrB_Info GB (_uop_tran__floor_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__floor_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__floor_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__floor_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__floor_fp64_fp64.c index bbe0f4eb30..5a95536319 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__floor_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__floor_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = floor (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__floor_fp64_fp64) +GrB_Info GB (_uop_apply__floor_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__floor_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__floor_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__floor_fp64_fp64) +GrB_Info GB (_uop_tran__floor_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__floor_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpe_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__frexpe_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__frexpe_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__frexpe_fp32_fp32.c index 521cee07f0..23e54c4d9e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpe_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__frexpe_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_frexpef (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__frexpe_fp32_fp32) +GrB_Info GB (_uop_apply__frexpe_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__frexpe_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__frexpe_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__frexpe_fp32_fp32) +GrB_Info GB (_uop_tran__frexpe_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__frexpe_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpe_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__frexpe_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__frexpe_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__frexpe_fp64_fp64.c index 34cf61e689..64f37f80ee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpe_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__frexpe_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_frexpe (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__frexpe_fp64_fp64) +GrB_Info GB (_uop_apply__frexpe_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__frexpe_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__frexpe_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__frexpe_fp64_fp64) +GrB_Info GB (_uop_tran__frexpe_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__frexpe_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpx_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__frexpx_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__frexpx_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__frexpx_fp32_fp32.c index 53552e90bd..9b4cea915f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpx_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__frexpx_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_frexpxf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__frexpx_fp32_fp32) +GrB_Info GB (_uop_apply__frexpx_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__frexpx_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__frexpx_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__frexpx_fp32_fp32) +GrB_Info GB (_uop_tran__frexpx_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__frexpx_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpx_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__frexpx_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__frexpx_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__frexpx_fp64_fp64.c index 9a9c30fdb7..cfd3910061 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__frexpx_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__frexpx_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_frexpx (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__frexpx_fp64_fp64) +GrB_Info GB (_uop_apply__frexpx_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__frexpx_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__frexpx_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__frexpx_fp64_fp64) +GrB_Info GB (_uop_tran__frexpx_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__frexpx_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_bool.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_bool.c index e01d3373af..40bef7b64b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_bool) +GrB_Info GB (_uop_tran__identity_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_fc32.c index 1cf380e94b..d4b52763e1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (GB_crealf (x) != 0) || (GB_cimagf (x) != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_fc32) +GrB_Info GB (_uop_apply__identity_bool_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_fc32) +GrB_Info GB (_uop_tran__identity_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_fc64.c index 3b5e2c1080..d2421c7b39 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (GB_creal (x) != 0) || (GB_cimag (x) != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_fc64) +GrB_Info GB (_uop_apply__identity_bool_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_fc64) +GrB_Info GB (_uop_tran__identity_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_fp32.c index 1b4f920449..5b82d47b0b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_fp32) +GrB_Info GB (_uop_apply__identity_bool_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_fp32) +GrB_Info GB (_uop_tran__identity_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_fp64.c index 56133a7e61..994806b9f4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_fp64) +GrB_Info GB (_uop_apply__identity_bool_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_fp64) +GrB_Info GB (_uop_tran__identity_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_int16.c index 8686acc2b8..281d023501 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_int16) +GrB_Info GB (_uop_apply__identity_bool_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_int16) +GrB_Info GB (_uop_tran__identity_bool_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_int32.c index 11831d50ac..6207088abd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_int32) +GrB_Info GB (_uop_apply__identity_bool_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_int32) +GrB_Info GB (_uop_tran__identity_bool_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_int64.c index 916c54fba6..03769be13a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_int64) +GrB_Info GB (_uop_apply__identity_bool_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_int64) +GrB_Info GB (_uop_tran__identity_bool_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_int8.c index 9125c017cf..4864d10f89 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_int8) +GrB_Info GB (_uop_apply__identity_bool_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_int8) +GrB_Info GB (_uop_tran__identity_bool_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint16.c index b0b9adade8..84c94834b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_uint16) +GrB_Info GB (_uop_apply__identity_bool_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_uint16) +GrB_Info GB (_uop_tran__identity_bool_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint32.c index 38ea40da90..3947ea4737 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_uint32) +GrB_Info GB (_uop_apply__identity_bool_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_uint32) +GrB_Info GB (_uop_tran__identity_bool_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint64.c index 7f9b5b18ea..0c0aa9829f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_uint64) +GrB_Info GB (_uop_apply__identity_bool_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_uint64) +GrB_Info GB (_uop_tran__identity_bool_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint8.c index 9d2b81ada6..1e98ce30aa 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_bool_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_bool_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (bool) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_bool_uint8) +GrB_Info GB (_uop_apply__identity_bool_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_bool_uint8) +GrB_Info GB (_uop_tran__identity_bool_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_bool.c index 267d529bb7..58168272ac 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_bool) +GrB_Info GB (_uop_apply__identity_fc32_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_bool) +GrB_Info GB (_uop_tran__identity_fc32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fc32.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fc32.c index 83bb88e8bb..e5cfa40f62 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_fc32) +GrB_Info GB (_uop_tran__identity_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fc64.c similarity index 82% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fc64.c index 4ad1544657..d1236e592d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) GB_creal (x), (float) GB_cimag (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_fc64) +GrB_Info GB (_uop_apply__identity_fc32_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_fc64) +GrB_Info GB (_uop_tran__identity_fc32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fp32.c index ea1f68ad7a..f855ce5c10 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_fp32) +GrB_Info GB (_uop_apply__identity_fc32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_fp32) +GrB_Info GB (_uop_tran__identity_fc32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fp64.c index 32e82abcab..8c81348381 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_fp64) +GrB_Info GB (_uop_apply__identity_fc32_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_fp64) +GrB_Info GB (_uop_tran__identity_fc32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int16.c index 90a408e81d..539b76ae49 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_int16) +GrB_Info GB (_uop_apply__identity_fc32_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_int16) +GrB_Info GB (_uop_tran__identity_fc32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int32.c index 161f498aa4..05f7d645be 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_int32) +GrB_Info GB (_uop_apply__identity_fc32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_int32) +GrB_Info GB (_uop_tran__identity_fc32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int64.c index 0a87b32c92..5df186437b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_int64) +GrB_Info GB (_uop_apply__identity_fc32_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_int64) +GrB_Info GB (_uop_tran__identity_fc32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int8.c index 807f0364a2..ce25a99c8b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_int8) +GrB_Info GB (_uop_apply__identity_fc32_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_int8) +GrB_Info GB (_uop_tran__identity_fc32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint16.c index be63e2ed4d..7c94c8c3e3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_uint16) +GrB_Info GB (_uop_apply__identity_fc32_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_uint16) +GrB_Info GB (_uop_tran__identity_fc32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint32.c index 5a7fc17e8d..f85ac87f84 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_uint32) +GrB_Info GB (_uop_apply__identity_fc32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_uint32) +GrB_Info GB (_uop_tran__identity_fc32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint64.c index 2b38acf61b..5d677f3fba 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_uint64) +GrB_Info GB (_uop_apply__identity_fc32_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_uint64) +GrB_Info GB (_uop_tran__identity_fc32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint8.c index 2631ca3225..80867e1654 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc32_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc32_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX32 ((float) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc32_uint8) +GrB_Info GB (_uop_apply__identity_fc32_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc32_uint8) +GrB_Info GB (_uop_tran__identity_fc32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_bool.c index b8597fb008..e2fa0a2375 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_bool) +GrB_Info GB (_uop_apply__identity_fc64_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_bool) +GrB_Info GB (_uop_tran__identity_fc64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fc32.c similarity index 82% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fc32.c index bc60792c76..aa3e3c2fa3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) GB_crealf (x), (double) GB_cimagf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_fc32) +GrB_Info GB (_uop_apply__identity_fc64_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_fc32) +GrB_Info GB (_uop_tran__identity_fc64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fc64.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fc64.c index e130f640b6..1045df6916 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_fc64) +GrB_Info GB (_uop_tran__identity_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fp32.c index 1022d67f31..5c1673919d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_fp32) +GrB_Info GB (_uop_apply__identity_fc64_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_fp32) +GrB_Info GB (_uop_tran__identity_fc64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fp64.c index 0283c49218..94961aaac2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_fp64) +GrB_Info GB (_uop_apply__identity_fc64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_fp64) +GrB_Info GB (_uop_tran__identity_fc64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int16.c index eb9d1d4162..9b2433b660 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_int16) +GrB_Info GB (_uop_apply__identity_fc64_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_int16) +GrB_Info GB (_uop_tran__identity_fc64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int32.c index e134b133d0..44618de085 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_int32) +GrB_Info GB (_uop_apply__identity_fc64_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_int32) +GrB_Info GB (_uop_tran__identity_fc64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int64.c index a215fa268d..f3df0fa62c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_int64) +GrB_Info GB (_uop_apply__identity_fc64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_int64) +GrB_Info GB (_uop_tran__identity_fc64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int8.c index 8e0cf0d223..e2d3608928 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_int8) +GrB_Info GB (_uop_apply__identity_fc64_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_int8) +GrB_Info GB (_uop_tran__identity_fc64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint16.c index e808c95086..2ab01b74d6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_uint16) +GrB_Info GB (_uop_apply__identity_fc64_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_uint16) +GrB_Info GB (_uop_tran__identity_fc64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint32.c index 696e3fb89a..f58225ff84 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_uint32) +GrB_Info GB (_uop_apply__identity_fc64_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_uint32) +GrB_Info GB (_uop_tran__identity_fc64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint64.c index 637de732be..bc7e9ffe7f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_uint64) +GrB_Info GB (_uop_apply__identity_fc64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_uint64) +GrB_Info GB (_uop_tran__identity_fc64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint8.c index fe849142f0..d7d776f200 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fc64_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fc64_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GJ_CMPLX64 ((double) (x), 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fc64_uint8) +GrB_Info GB (_uop_apply__identity_fc64_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fc64_uint8) +GrB_Info GB (_uop_tran__identity_fc64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_bool.c index cebf609a8e..1d04d1e136 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_bool) +GrB_Info GB (_uop_apply__identity_fp32_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_bool) +GrB_Info GB (_uop_tran__identity_fp32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fc32.c index 77cfd85174..0790e2bd27 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) GB_crealf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_fc32) +GrB_Info GB (_uop_apply__identity_fp32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_fc32) +GrB_Info GB (_uop_tran__identity_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fc64.c index 8dfca92dbf..fddc1f4362 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) GB_creal (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_fc64) +GrB_Info GB (_uop_apply__identity_fp32_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_fc64) +GrB_Info GB (_uop_tran__identity_fp32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fp32.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fp32.c index 13acd0327e..29b46a1597 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_fp32) +GrB_Info GB (_uop_tran__identity_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fp64.c index 3496aaf022..9033e35df4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_fp64) +GrB_Info GB (_uop_apply__identity_fp32_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_fp64) +GrB_Info GB (_uop_tran__identity_fp32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int16.c index 729e308d73..1435028440 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_int16) +GrB_Info GB (_uop_apply__identity_fp32_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_int16) +GrB_Info GB (_uop_tran__identity_fp32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int32.c index b81cba0f16..c521e68676 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_int32) +GrB_Info GB (_uop_apply__identity_fp32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_int32) +GrB_Info GB (_uop_tran__identity_fp32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int64.c index bdc4bc1368..ff308de14d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_int64) +GrB_Info GB (_uop_apply__identity_fp32_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_int64) +GrB_Info GB (_uop_tran__identity_fp32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int8.c index 23399cfb79..246112f961 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_int8) +GrB_Info GB (_uop_apply__identity_fp32_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_int8) +GrB_Info GB (_uop_tran__identity_fp32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint16.c index a56bb9f823..5d75d6e77d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_uint16) +GrB_Info GB (_uop_apply__identity_fp32_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_uint16) +GrB_Info GB (_uop_tran__identity_fp32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint32.c index 0ef1442f27..d86644b824 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_uint32) +GrB_Info GB (_uop_apply__identity_fp32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_uint32) +GrB_Info GB (_uop_tran__identity_fp32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint64.c index f2009b64e5..f7dce03f03 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_uint64) +GrB_Info GB (_uop_apply__identity_fp32_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_uint64) +GrB_Info GB (_uop_tran__identity_fp32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint8.c index b259946e85..3f15fa32bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp32_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp32_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (float) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp32_uint8) +GrB_Info GB (_uop_apply__identity_fp32_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp32_uint8) +GrB_Info GB (_uop_tran__identity_fp32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_bool.c index 4f46bce52a..368ef85dc4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_bool) +GrB_Info GB (_uop_apply__identity_fp64_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_bool) +GrB_Info GB (_uop_tran__identity_fp64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fc32.c index 47c9f8f656..d09da36d8b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) GB_crealf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_fc32) +GrB_Info GB (_uop_apply__identity_fp64_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_fc32) +GrB_Info GB (_uop_tran__identity_fp64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fc64.c index d46cc70abd..6c5241790c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) GB_creal (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_fc64) +GrB_Info GB (_uop_apply__identity_fp64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_fc64) +GrB_Info GB (_uop_tran__identity_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fp32.c index 123254f9ef..c63a5e83a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_fp32) +GrB_Info GB (_uop_apply__identity_fp64_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_fp32) +GrB_Info GB (_uop_tran__identity_fp64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fp64.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fp64.c index f4c6d34019..6a924ec63d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_fp64) +GrB_Info GB (_uop_tran__identity_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int16.c index da81532aef..f63bcda3e6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_int16) +GrB_Info GB (_uop_apply__identity_fp64_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_int16) +GrB_Info GB (_uop_tran__identity_fp64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int32.c index 355fb0cd3a..136c1960e5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_int32) +GrB_Info GB (_uop_apply__identity_fp64_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_int32) +GrB_Info GB (_uop_tran__identity_fp64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int64.c index 61f80e9000..87220a6e89 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_int64) +GrB_Info GB (_uop_apply__identity_fp64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_int64) +GrB_Info GB (_uop_tran__identity_fp64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int8.c index 8c2369dcbf..c1660a20a5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_int8) +GrB_Info GB (_uop_apply__identity_fp64_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_int8) +GrB_Info GB (_uop_tran__identity_fp64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint16.c index 098c6df060..8e3e9ab7c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_uint16) +GrB_Info GB (_uop_apply__identity_fp64_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_uint16) +GrB_Info GB (_uop_tran__identity_fp64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint32.c index ff4d6aa33d..66ce54992e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_uint32) +GrB_Info GB (_uop_apply__identity_fp64_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_uint32) +GrB_Info GB (_uop_tran__identity_fp64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint64.c index cf63524874..9e5eb791e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_uint64) +GrB_Info GB (_uop_apply__identity_fp64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_uint64) +GrB_Info GB (_uop_tran__identity_fp64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint8.c index 1d0c55433f..b958ef5199 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_fp64_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_fp64_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (double) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_fp64_uint8) +GrB_Info GB (_uop_apply__identity_fp64_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_fp64_uint8) +GrB_Info GB (_uop_tran__identity_fp64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_bool.c index d445c4b3e8..d730387d9e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_bool) +GrB_Info GB (_uop_apply__identity_int16_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_bool) +GrB_Info GB (_uop_tran__identity_int16_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_fc32.c index 7132c73473..08e3bf708b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int16_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_fc32) +GrB_Info GB (_uop_apply__identity_int16_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_fc32) +GrB_Info GB (_uop_tran__identity_int16_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_fc64.c index bf24d504ae..78eb60fad5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int16_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_fc64) +GrB_Info GB (_uop_apply__identity_int16_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_fc64) +GrB_Info GB (_uop_tran__identity_int16_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_fp32.c index 3335a45d61..61bb82c93f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int16_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_fp32) +GrB_Info GB (_uop_apply__identity_int16_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_fp32) +GrB_Info GB (_uop_tran__identity_int16_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_fp64.c index f7a0f8bcc2..39a2908a8c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int16_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_fp64) +GrB_Info GB (_uop_apply__identity_int16_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_fp64) +GrB_Info GB (_uop_tran__identity_int16_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int16.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_int16.c index b8f05f077e..891fd967e2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_int16) +GrB_Info GB (_uop_tran__identity_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_int32.c index fd42a48f51..bfdc9aa3a0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_int32) +GrB_Info GB (_uop_apply__identity_int16_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_int32) +GrB_Info GB (_uop_tran__identity_int16_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_int64.c index 291bc052a5..4dfd1c2a1d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_int64) +GrB_Info GB (_uop_apply__identity_int16_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_int64) +GrB_Info GB (_uop_tran__identity_int16_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_int8.c index 8f32fc93bb..125ca02036 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_int8) +GrB_Info GB (_uop_apply__identity_int16_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_int8) +GrB_Info GB (_uop_tran__identity_int16_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint16.c index 08bc282f4b..e72ba27fa0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_uint16) +GrB_Info GB (_uop_apply__identity_int16_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_uint16) +GrB_Info GB (_uop_tran__identity_int16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint32.c index f775722760..47f61bc2f0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_uint32) +GrB_Info GB (_uop_apply__identity_int16_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_uint32) +GrB_Info GB (_uop_tran__identity_int16_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint64.c index 02282deae8..459890b334 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_uint64) +GrB_Info GB (_uop_apply__identity_int16_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_uint64) +GrB_Info GB (_uop_tran__identity_int16_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint8.c index 91e339e4cd..f6151e29fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int16_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int16_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int16_uint8) +GrB_Info GB (_uop_apply__identity_int16_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int16_uint8) +GrB_Info GB (_uop_tran__identity_int16_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_bool.c index 3d115576b1..9385785d89 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_bool) +GrB_Info GB (_uop_apply__identity_int32_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_bool) +GrB_Info GB (_uop_tran__identity_int32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_fc32.c index 90e313fe3d..cc888c927f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int32_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_fc32) +GrB_Info GB (_uop_apply__identity_int32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_fc32) +GrB_Info GB (_uop_tran__identity_int32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_fc64.c index 57313e3cdb..61054fba8f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int32_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_fc64) +GrB_Info GB (_uop_apply__identity_int32_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_fc64) +GrB_Info GB (_uop_tran__identity_int32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_fp32.c index dd7b066419..f6a74f11fc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int32_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_fp32) +GrB_Info GB (_uop_apply__identity_int32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_fp32) +GrB_Info GB (_uop_tran__identity_int32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_fp64.c index fb3e7c69f1..baec4367c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int32_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_fp64) +GrB_Info GB (_uop_apply__identity_int32_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_fp64) +GrB_Info GB (_uop_tran__identity_int32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_int16.c index 60a29123ea..f1292b83bc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_int16) +GrB_Info GB (_uop_apply__identity_int32_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_int16) +GrB_Info GB (_uop_tran__identity_int32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int32.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_int32.c index 6753417ab2..aa4ca8e21b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_int32) +GrB_Info GB (_uop_tran__identity_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_int64.c index fe3066638b..d1fdb47887 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_int64) +GrB_Info GB (_uop_apply__identity_int32_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_int64) +GrB_Info GB (_uop_tran__identity_int32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_int8.c index 13d3243cfb..c1c201cfbf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_int8) +GrB_Info GB (_uop_apply__identity_int32_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_int8) +GrB_Info GB (_uop_tran__identity_int32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint16.c index c171d98b8a..065e4352ef 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_uint16) +GrB_Info GB (_uop_apply__identity_int32_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_uint16) +GrB_Info GB (_uop_tran__identity_int32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint32.c index f26847f5bd..e90d211443 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_uint32) +GrB_Info GB (_uop_apply__identity_int32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_uint32) +GrB_Info GB (_uop_tran__identity_int32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint64.c index 782342dc50..8c0ef0b187 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_uint64) +GrB_Info GB (_uop_apply__identity_int32_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_uint64) +GrB_Info GB (_uop_tran__identity_int32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint8.c index 2fe277205f..8f5f68fc0f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int32_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int32_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int32_uint8) +GrB_Info GB (_uop_apply__identity_int32_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int32_uint8) +GrB_Info GB (_uop_tran__identity_int32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_bool.c index 86df81b0bf..117f9d2742 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_bool) +GrB_Info GB (_uop_apply__identity_int64_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_bool) +GrB_Info GB (_uop_tran__identity_int64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_fc32.c index 808337c532..94381a4f91 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int64_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_fc32) +GrB_Info GB (_uop_apply__identity_int64_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_fc32) +GrB_Info GB (_uop_tran__identity_int64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_fc64.c index cac1e1dea6..6d93bb57cc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int64_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_fc64) +GrB_Info GB (_uop_apply__identity_int64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_fc64) +GrB_Info GB (_uop_tran__identity_int64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_fp32.c index f038b7f0e6..5240f24a32 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int64_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_fp32) +GrB_Info GB (_uop_apply__identity_int64_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_fp32) +GrB_Info GB (_uop_tran__identity_int64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_fp64.c index 82ce509109..68dc8eac02 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int64_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_fp64) +GrB_Info GB (_uop_apply__identity_int64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_fp64) +GrB_Info GB (_uop_tran__identity_int64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_int16.c index 004db36c1e..6892b15a77 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_int16) +GrB_Info GB (_uop_apply__identity_int64_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_int16) +GrB_Info GB (_uop_tran__identity_int64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_int32.c index 7273c45ebf..b45835bde1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_int32) +GrB_Info GB (_uop_apply__identity_int64_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_int32) +GrB_Info GB (_uop_tran__identity_int64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int64.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_int64.c index 94d74d0b78..7d7ba5ad13 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_int64) +GrB_Info GB (_uop_tran__identity_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_int8.c index d8480c9f44..5dd88d2902 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_int8) +GrB_Info GB (_uop_apply__identity_int64_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_int8) +GrB_Info GB (_uop_tran__identity_int64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint16.c index 2a37c1293e..dc6beb5f46 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_uint16) +GrB_Info GB (_uop_apply__identity_int64_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_uint16) +GrB_Info GB (_uop_tran__identity_int64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint32.c index 28f04ab382..6b93a6bb79 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_uint32) +GrB_Info GB (_uop_apply__identity_int64_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_uint32) +GrB_Info GB (_uop_tran__identity_int64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint64.c index 2790d3fc8a..7ddf90aa07 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_uint64) +GrB_Info GB (_uop_apply__identity_int64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_uint64) +GrB_Info GB (_uop_tran__identity_int64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint8.c index 2cc472120d..5aa05149e2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int64_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int64_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int64_uint8) +GrB_Info GB (_uop_apply__identity_int64_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int64_uint8) +GrB_Info GB (_uop_tran__identity_int64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_bool.c index f79fdd2374..ae9971bff8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_bool) +GrB_Info GB (_uop_apply__identity_int8_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_bool) +GrB_Info GB (_uop_tran__identity_int8_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_fc32.c index b4fdcdd723..63630131d0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int8_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_fc32) +GrB_Info GB (_uop_apply__identity_int8_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_fc32) +GrB_Info GB (_uop_tran__identity_int8_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_fc64.c index 6bfb5e7089..8a678fc850 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int8_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_fc64) +GrB_Info GB (_uop_apply__identity_int8_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_fc64) +GrB_Info GB (_uop_tran__identity_int8_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_fp32.c index 7446b8df18..7b86c56f6f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int8_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_fp32) +GrB_Info GB (_uop_apply__identity_int8_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_fp32) +GrB_Info GB (_uop_tran__identity_int8_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_fp64.c index e8521ff08a..d4355c08ac 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_int8_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_fp64) +GrB_Info GB (_uop_apply__identity_int8_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_fp64) +GrB_Info GB (_uop_tran__identity_int8_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_int16.c index ee010096fb..4b7e75d82a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_int16) +GrB_Info GB (_uop_apply__identity_int8_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_int16) +GrB_Info GB (_uop_tran__identity_int8_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_int32.c index 7611d9428b..d776ab9bdb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_int32) +GrB_Info GB (_uop_apply__identity_int8_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_int32) +GrB_Info GB (_uop_tran__identity_int8_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_int64.c index e6190da775..6125d0c54b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_int64) +GrB_Info GB (_uop_apply__identity_int8_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_int64) +GrB_Info GB (_uop_tran__identity_int8_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int8.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_int8.c index 1a4d4d95e7..de1a823b6b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_int8) +GrB_Info GB (_uop_tran__identity_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint16.c index ef6b4eb054..363be5c4eb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_uint16) +GrB_Info GB (_uop_apply__identity_int8_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_uint16) +GrB_Info GB (_uop_tran__identity_int8_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint32.c index 69745d903a..a7e6944f96 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_uint32) +GrB_Info GB (_uop_apply__identity_int8_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_uint32) +GrB_Info GB (_uop_tran__identity_int8_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint64.c index 9daef850d8..4185b843cc 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_uint64) +GrB_Info GB (_uop_apply__identity_int8_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_uint64) +GrB_Info GB (_uop_tran__identity_int8_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint8.c index b1b0f830c6..4df89ff5fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_int8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_int8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (int8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_int8_uint8) +GrB_Info GB (_uop_apply__identity_int8_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_int8_uint8) +GrB_Info GB (_uop_tran__identity_int8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_bool.c index 933bd0ca56..cb5f01ae84 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_bool) +GrB_Info GB (_uop_apply__identity_uint16_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_bool) +GrB_Info GB (_uop_tran__identity_uint16_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fc32.c index 948a567fd5..3c52b6050f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint16_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_fc32) +GrB_Info GB (_uop_apply__identity_uint16_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_fc32) +GrB_Info GB (_uop_tran__identity_uint16_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fc64.c index d71d8e37f0..9304c16d04 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint16_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_fc64) +GrB_Info GB (_uop_apply__identity_uint16_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_fc64) +GrB_Info GB (_uop_tran__identity_uint16_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fp32.c index 1f29ec4bb2..a55b73addd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint16_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_fp32) +GrB_Info GB (_uop_apply__identity_uint16_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_fp32) +GrB_Info GB (_uop_tran__identity_uint16_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fp64.c index f33e9e1a83..3986d19247 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint16_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_fp64) +GrB_Info GB (_uop_apply__identity_uint16_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_fp64) +GrB_Info GB (_uop_tran__identity_uint16_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int16.c index 0219a235ae..b1a028da6c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_int16) +GrB_Info GB (_uop_apply__identity_uint16_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_int16) +GrB_Info GB (_uop_tran__identity_uint16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int32.c index ee1f32cc1f..8c080aaf16 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_int32) +GrB_Info GB (_uop_apply__identity_uint16_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_int32) +GrB_Info GB (_uop_tran__identity_uint16_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int64.c index 512e9d8d33..54d2ea6a06 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_int64) +GrB_Info GB (_uop_apply__identity_uint16_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_int64) +GrB_Info GB (_uop_tran__identity_uint16_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int8.c index 320774dce6..13a90a99d2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_int8) +GrB_Info GB (_uop_apply__identity_uint16_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_int8) +GrB_Info GB (_uop_tran__identity_uint16_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint16.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint16.c index 13e4e37b64..b93071b06f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_uint16) +GrB_Info GB (_uop_tran__identity_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint32.c index 4467b8f130..cca5137555 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_uint32) +GrB_Info GB (_uop_apply__identity_uint16_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_uint32) +GrB_Info GB (_uop_tran__identity_uint16_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint64.c index 15ce5a325b..e6805b5e41 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_uint64) +GrB_Info GB (_uop_apply__identity_uint16_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_uint64) +GrB_Info GB (_uop_tran__identity_uint16_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint8.c index 03f5e4f865..a9c36e77a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint16_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint16_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint16_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint16_uint8) +GrB_Info GB (_uop_apply__identity_uint16_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint16_uint8) +GrB_Info GB (_uop_tran__identity_uint16_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_bool.c index 7d5b7e6aaf..0f282bb0e7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_bool) +GrB_Info GB (_uop_apply__identity_uint32_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_bool) +GrB_Info GB (_uop_tran__identity_uint32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fc32.c index 55e24b3513..bbbc706885 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint32_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_fc32) +GrB_Info GB (_uop_apply__identity_uint32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_fc32) +GrB_Info GB (_uop_tran__identity_uint32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fc64.c index 7794722ea2..808a060361 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint32_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_fc64) +GrB_Info GB (_uop_apply__identity_uint32_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_fc64) +GrB_Info GB (_uop_tran__identity_uint32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fp32.c index ea88cc1233..b363e1ec9e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint32_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_fp32) +GrB_Info GB (_uop_apply__identity_uint32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_fp32) +GrB_Info GB (_uop_tran__identity_uint32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fp64.c index 9679e52819..f4b0c4effd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint32_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_fp64) +GrB_Info GB (_uop_apply__identity_uint32_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_fp64) +GrB_Info GB (_uop_tran__identity_uint32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int16.c index f87e933e51..5a8da524a6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_int16) +GrB_Info GB (_uop_apply__identity_uint32_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_int16) +GrB_Info GB (_uop_tran__identity_uint32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int32.c index 5e447217ea..65f6a1943a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_int32) +GrB_Info GB (_uop_apply__identity_uint32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_int32) +GrB_Info GB (_uop_tran__identity_uint32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int64.c index 3287174603..0eae1ba92a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_int64) +GrB_Info GB (_uop_apply__identity_uint32_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_int64) +GrB_Info GB (_uop_tran__identity_uint32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int8.c index 9d27730616..320aa10726 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_int8) +GrB_Info GB (_uop_apply__identity_uint32_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_int8) +GrB_Info GB (_uop_tran__identity_uint32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint16.c index 1ab1b1c825..4f9df03bc0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_uint16) +GrB_Info GB (_uop_apply__identity_uint32_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_uint16) +GrB_Info GB (_uop_tran__identity_uint32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint32.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint32.c index fbc9395d6f..f39550d4c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_uint32) +GrB_Info GB (_uop_tran__identity_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint64.c index d2813ef577..556015b6b1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_uint64) +GrB_Info GB (_uop_apply__identity_uint32_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_uint64) +GrB_Info GB (_uop_tran__identity_uint32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint8.c index cde28422d5..50cb8f0989 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint32_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint32_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint32_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint32_uint8) +GrB_Info GB (_uop_apply__identity_uint32_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint32_uint8) +GrB_Info GB (_uop_tran__identity_uint32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_bool.c index 2fd0bf902b..a6dd8095f4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_bool) +GrB_Info GB (_uop_apply__identity_uint64_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_bool) +GrB_Info GB (_uop_tran__identity_uint64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fc32.c index 5117994de3..b35756460a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint64_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_fc32) +GrB_Info GB (_uop_apply__identity_uint64_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_fc32) +GrB_Info GB (_uop_tran__identity_uint64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fc64.c index 6217b6afbb..e07f7a605a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint64_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_fc64) +GrB_Info GB (_uop_apply__identity_uint64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_fc64) +GrB_Info GB (_uop_tran__identity_uint64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fp32.c index 4f6bd090fd..b4ac31c629 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint64_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_fp32) +GrB_Info GB (_uop_apply__identity_uint64_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_fp32) +GrB_Info GB (_uop_tran__identity_uint64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fp64.c index be21b30f31..1d8543f200 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint64_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_fp64) +GrB_Info GB (_uop_apply__identity_uint64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_fp64) +GrB_Info GB (_uop_tran__identity_uint64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int16.c index 3149aef7d7..42bfdcd4c4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_int16) +GrB_Info GB (_uop_apply__identity_uint64_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_int16) +GrB_Info GB (_uop_tran__identity_uint64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int32.c index dd4c262693..bd3d82acd0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_int32) +GrB_Info GB (_uop_apply__identity_uint64_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_int32) +GrB_Info GB (_uop_tran__identity_uint64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int64.c index 4928348790..d4fa698678 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_int64) +GrB_Info GB (_uop_apply__identity_uint64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_int64) +GrB_Info GB (_uop_tran__identity_uint64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int8.c index bc51f54ed7..6807c4a8bb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_int8) +GrB_Info GB (_uop_apply__identity_uint64_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_int8) +GrB_Info GB (_uop_tran__identity_uint64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint16.c index d8868d9fbe..91e7ec6a5c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_uint16) +GrB_Info GB (_uop_apply__identity_uint64_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_uint16) +GrB_Info GB (_uop_tran__identity_uint64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint32.c index 3d6f8bfbd5..93c0959a31 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_uint32) +GrB_Info GB (_uop_apply__identity_uint64_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_uint32) +GrB_Info GB (_uop_tran__identity_uint64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint64.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint64.c index cb8f5d2b0b..cb3a276996 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_uint64) +GrB_Info GB (_uop_tran__identity_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint8.c index 86221d367a..c625011638 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint64_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint64_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint64_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint64_uint8) +GrB_Info GB (_uop_apply__identity_uint64_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint64_uint8) +GrB_Info GB (_uop_tran__identity_uint64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_bool.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_bool.c index ec7e7bc37b..3eaa4eb12c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_bool) +GrB_Info GB (_uop_apply__identity_uint8_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_bool) +GrB_Info GB (_uop_tran__identity_uint8_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fc32.c index f34bb308a9..636c7bb1a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint8_t ((double) GB_crealf (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_fc32) +GrB_Info GB (_uop_apply__identity_uint8_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_fc32) +GrB_Info GB (_uop_tran__identity_uint8_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fc64.c index 9cd055b7ba..611846e842 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint8_t (GB_creal (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_fc64) +GrB_Info GB (_uop_apply__identity_uint8_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_fc64) +GrB_Info GB (_uop_tran__identity_uint8_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fp32.c index 609bf28e37..d34aed8439 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint8_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_fp32) +GrB_Info GB (_uop_apply__identity_uint8_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_fp32) +GrB_Info GB (_uop_tran__identity_uint8_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fp64.c index e5bd6eab62..63a7c651ff 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cast_to_uint8_t ((double) (x)) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_fp64) +GrB_Info GB (_uop_apply__identity_uint8_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_fp64) +GrB_Info GB (_uop_tran__identity_uint8_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int16.c index a8d040b372..09e5fdd5c5 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_int16) +GrB_Info GB (_uop_apply__identity_uint8_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_int16) +GrB_Info GB (_uop_tran__identity_uint8_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int32.c index f822d67c1b..ed05e47143 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_int32) +GrB_Info GB (_uop_apply__identity_uint8_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_int32) +GrB_Info GB (_uop_tran__identity_uint8_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int64.c index 2ed3ef5adb..9b5f3f7116 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_int64) +GrB_Info GB (_uop_apply__identity_uint8_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_int64) +GrB_Info GB (_uop_tran__identity_uint8_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int8.c index 7a8a8bbed7..351196f229 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_int8) +GrB_Info GB (_uop_apply__identity_uint8_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_int8) +GrB_Info GB (_uop_tran__identity_uint8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint16.c index 122d20bc87..3666992028 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_uint16) +GrB_Info GB (_uop_apply__identity_uint8_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_uint16) +GrB_Info GB (_uop_tran__identity_uint8_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint32.c index 32f05416ea..228e11520e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_uint32) +GrB_Info GB (_uop_apply__identity_uint8_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_uint32) +GrB_Info GB (_uop_tran__identity_uint8_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint64.c index 1f39b9e1bd..ccbdeccb4b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (uint8_t) x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__identity_uint8_uint64) +GrB_Info GB (_uop_apply__identity_uint8_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_uint64) +GrB_Info GB (_uop_tran__identity_uint8_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint8.c similarity index 80% rename from GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint8.c index 4b3dc07bc4..c4648839e6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__identity_uint8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__identity_uint8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__identity_uint8_uint8) +GrB_Info GB (_uop_tran__identity_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__include.h b/GraphBLAS/FactoryKernels/GB_uop__include.h similarity index 75% rename from GraphBLAS/Source/FactoryKernels/GB_unop__include.h rename to GraphBLAS/FactoryKernels/GB_uop__include.h index cef8329258..5d051c3229 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__include.h +++ b/GraphBLAS/FactoryKernels/GB_uop__include.h @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop__include.h: definitions for GB_unop__*.c +// GB_uop__include.h: definitions for GB_uop__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -// This file has been automatically generated from Generator/GB_unop.h -#include "GB_math.h" +// This file has been automatically generated from Generator/GB_uop.h +#include "math/GB_math.h" -GrB_Info GB (_unop_tran__identity_bool_bool) +GrB_Info GB (_uop_tran__identity_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -20,7 +20,7 @@ GrB_Info GB (_unop_tran__identity_bool_bool) ) ; -GrB_Info GB (_unop_apply__identity_bool_int8) +GrB_Info GB (_uop_apply__identity_bool_int8) ( GB_void *Cx, const GB_void *Ax, @@ -29,7 +29,7 @@ GrB_Info GB (_unop_apply__identity_bool_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_int8) +GrB_Info GB (_uop_tran__identity_bool_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -40,7 +40,7 @@ GrB_Info GB (_unop_tran__identity_bool_int8) ) ; -GrB_Info GB (_unop_apply__identity_bool_int16) +GrB_Info GB (_uop_apply__identity_bool_int16) ( GB_void *Cx, const GB_void *Ax, @@ -49,7 +49,7 @@ GrB_Info GB (_unop_apply__identity_bool_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_int16) +GrB_Info GB (_uop_tran__identity_bool_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -60,7 +60,7 @@ GrB_Info GB (_unop_tran__identity_bool_int16) ) ; -GrB_Info GB (_unop_apply__identity_bool_int32) +GrB_Info GB (_uop_apply__identity_bool_int32) ( GB_void *Cx, const GB_void *Ax, @@ -69,7 +69,7 @@ GrB_Info GB (_unop_apply__identity_bool_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_int32) +GrB_Info GB (_uop_tran__identity_bool_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -80,7 +80,7 @@ GrB_Info GB (_unop_tran__identity_bool_int32) ) ; -GrB_Info GB (_unop_apply__identity_bool_int64) +GrB_Info GB (_uop_apply__identity_bool_int64) ( GB_void *Cx, const GB_void *Ax, @@ -89,7 +89,7 @@ GrB_Info GB (_unop_apply__identity_bool_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_int64) +GrB_Info GB (_uop_tran__identity_bool_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -100,7 +100,7 @@ GrB_Info GB (_unop_tran__identity_bool_int64) ) ; -GrB_Info GB (_unop_apply__identity_bool_uint8) +GrB_Info GB (_uop_apply__identity_bool_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -109,7 +109,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_uint8) +GrB_Info GB (_uop_tran__identity_bool_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -120,7 +120,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint8) ) ; -GrB_Info GB (_unop_apply__identity_bool_uint16) +GrB_Info GB (_uop_apply__identity_bool_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -129,7 +129,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_uint16) +GrB_Info GB (_uop_tran__identity_bool_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -140,7 +140,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint16) ) ; -GrB_Info GB (_unop_apply__identity_bool_uint32) +GrB_Info GB (_uop_apply__identity_bool_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -149,7 +149,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_uint32) +GrB_Info GB (_uop_tran__identity_bool_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -160,7 +160,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint32) ) ; -GrB_Info GB (_unop_apply__identity_bool_uint64) +GrB_Info GB (_uop_apply__identity_bool_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -169,7 +169,7 @@ GrB_Info GB (_unop_apply__identity_bool_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_uint64) +GrB_Info GB (_uop_tran__identity_bool_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -180,7 +180,7 @@ GrB_Info GB (_unop_tran__identity_bool_uint64) ) ; -GrB_Info GB (_unop_apply__identity_bool_fp32) +GrB_Info GB (_uop_apply__identity_bool_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -189,7 +189,7 @@ GrB_Info GB (_unop_apply__identity_bool_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_fp32) +GrB_Info GB (_uop_tran__identity_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -200,7 +200,7 @@ GrB_Info GB (_unop_tran__identity_bool_fp32) ) ; -GrB_Info GB (_unop_apply__identity_bool_fp64) +GrB_Info GB (_uop_apply__identity_bool_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -209,7 +209,7 @@ GrB_Info GB (_unop_apply__identity_bool_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_fp64) +GrB_Info GB (_uop_tran__identity_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -220,7 +220,7 @@ GrB_Info GB (_unop_tran__identity_bool_fp64) ) ; -GrB_Info GB (_unop_apply__identity_bool_fc32) +GrB_Info GB (_uop_apply__identity_bool_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -229,7 +229,7 @@ GrB_Info GB (_unop_apply__identity_bool_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_fc32) +GrB_Info GB (_uop_tran__identity_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -240,7 +240,7 @@ GrB_Info GB (_unop_tran__identity_bool_fc32) ) ; -GrB_Info GB (_unop_apply__identity_bool_fc64) +GrB_Info GB (_uop_apply__identity_bool_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -249,7 +249,7 @@ GrB_Info GB (_unop_apply__identity_bool_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_bool_fc64) +GrB_Info GB (_uop_tran__identity_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -260,7 +260,7 @@ GrB_Info GB (_unop_tran__identity_bool_fc64) ) ; -GrB_Info GB (_unop_apply__identity_int8_bool) +GrB_Info GB (_uop_apply__identity_int8_bool) ( GB_void *Cx, const GB_void *Ax, @@ -269,7 +269,7 @@ GrB_Info GB (_unop_apply__identity_int8_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_bool) +GrB_Info GB (_uop_tran__identity_int8_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -280,7 +280,7 @@ GrB_Info GB (_unop_tran__identity_int8_bool) ) ; -GrB_Info GB (_unop_tran__identity_int8_int8) +GrB_Info GB (_uop_tran__identity_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -291,7 +291,7 @@ GrB_Info GB (_unop_tran__identity_int8_int8) ) ; -GrB_Info GB (_unop_apply__identity_int8_int16) +GrB_Info GB (_uop_apply__identity_int8_int16) ( GB_void *Cx, const GB_void *Ax, @@ -300,7 +300,7 @@ GrB_Info GB (_unop_apply__identity_int8_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_int16) +GrB_Info GB (_uop_tran__identity_int8_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -311,7 +311,7 @@ GrB_Info GB (_unop_tran__identity_int8_int16) ) ; -GrB_Info GB (_unop_apply__identity_int8_int32) +GrB_Info GB (_uop_apply__identity_int8_int32) ( GB_void *Cx, const GB_void *Ax, @@ -320,7 +320,7 @@ GrB_Info GB (_unop_apply__identity_int8_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_int32) +GrB_Info GB (_uop_tran__identity_int8_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -331,7 +331,7 @@ GrB_Info GB (_unop_tran__identity_int8_int32) ) ; -GrB_Info GB (_unop_apply__identity_int8_int64) +GrB_Info GB (_uop_apply__identity_int8_int64) ( GB_void *Cx, const GB_void *Ax, @@ -340,7 +340,7 @@ GrB_Info GB (_unop_apply__identity_int8_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_int64) +GrB_Info GB (_uop_tran__identity_int8_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -351,7 +351,7 @@ GrB_Info GB (_unop_tran__identity_int8_int64) ) ; -GrB_Info GB (_unop_apply__identity_int8_uint8) +GrB_Info GB (_uop_apply__identity_int8_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -360,7 +360,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_uint8) +GrB_Info GB (_uop_tran__identity_int8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -371,7 +371,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint8) ) ; -GrB_Info GB (_unop_apply__identity_int8_uint16) +GrB_Info GB (_uop_apply__identity_int8_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -380,7 +380,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_uint16) +GrB_Info GB (_uop_tran__identity_int8_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -391,7 +391,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint16) ) ; -GrB_Info GB (_unop_apply__identity_int8_uint32) +GrB_Info GB (_uop_apply__identity_int8_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -400,7 +400,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_uint32) +GrB_Info GB (_uop_tran__identity_int8_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -411,7 +411,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint32) ) ; -GrB_Info GB (_unop_apply__identity_int8_uint64) +GrB_Info GB (_uop_apply__identity_int8_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -420,7 +420,7 @@ GrB_Info GB (_unop_apply__identity_int8_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_uint64) +GrB_Info GB (_uop_tran__identity_int8_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -431,7 +431,7 @@ GrB_Info GB (_unop_tran__identity_int8_uint64) ) ; -GrB_Info GB (_unop_apply__identity_int8_fp32) +GrB_Info GB (_uop_apply__identity_int8_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -440,7 +440,7 @@ GrB_Info GB (_unop_apply__identity_int8_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_fp32) +GrB_Info GB (_uop_tran__identity_int8_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -451,7 +451,7 @@ GrB_Info GB (_unop_tran__identity_int8_fp32) ) ; -GrB_Info GB (_unop_apply__identity_int8_fp64) +GrB_Info GB (_uop_apply__identity_int8_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -460,7 +460,7 @@ GrB_Info GB (_unop_apply__identity_int8_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_fp64) +GrB_Info GB (_uop_tran__identity_int8_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -471,7 +471,7 @@ GrB_Info GB (_unop_tran__identity_int8_fp64) ) ; -GrB_Info GB (_unop_apply__identity_int8_fc32) +GrB_Info GB (_uop_apply__identity_int8_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -480,7 +480,7 @@ GrB_Info GB (_unop_apply__identity_int8_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_fc32) +GrB_Info GB (_uop_tran__identity_int8_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -491,7 +491,7 @@ GrB_Info GB (_unop_tran__identity_int8_fc32) ) ; -GrB_Info GB (_unop_apply__identity_int8_fc64) +GrB_Info GB (_uop_apply__identity_int8_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -500,7 +500,7 @@ GrB_Info GB (_unop_apply__identity_int8_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int8_fc64) +GrB_Info GB (_uop_tran__identity_int8_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -511,7 +511,7 @@ GrB_Info GB (_unop_tran__identity_int8_fc64) ) ; -GrB_Info GB (_unop_apply__identity_int16_bool) +GrB_Info GB (_uop_apply__identity_int16_bool) ( GB_void *Cx, const GB_void *Ax, @@ -520,7 +520,7 @@ GrB_Info GB (_unop_apply__identity_int16_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_bool) +GrB_Info GB (_uop_tran__identity_int16_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -531,7 +531,7 @@ GrB_Info GB (_unop_tran__identity_int16_bool) ) ; -GrB_Info GB (_unop_apply__identity_int16_int8) +GrB_Info GB (_uop_apply__identity_int16_int8) ( GB_void *Cx, const GB_void *Ax, @@ -540,7 +540,7 @@ GrB_Info GB (_unop_apply__identity_int16_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_int8) +GrB_Info GB (_uop_tran__identity_int16_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -551,7 +551,7 @@ GrB_Info GB (_unop_tran__identity_int16_int8) ) ; -GrB_Info GB (_unop_tran__identity_int16_int16) +GrB_Info GB (_uop_tran__identity_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -562,7 +562,7 @@ GrB_Info GB (_unop_tran__identity_int16_int16) ) ; -GrB_Info GB (_unop_apply__identity_int16_int32) +GrB_Info GB (_uop_apply__identity_int16_int32) ( GB_void *Cx, const GB_void *Ax, @@ -571,7 +571,7 @@ GrB_Info GB (_unop_apply__identity_int16_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_int32) +GrB_Info GB (_uop_tran__identity_int16_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -582,7 +582,7 @@ GrB_Info GB (_unop_tran__identity_int16_int32) ) ; -GrB_Info GB (_unop_apply__identity_int16_int64) +GrB_Info GB (_uop_apply__identity_int16_int64) ( GB_void *Cx, const GB_void *Ax, @@ -591,7 +591,7 @@ GrB_Info GB (_unop_apply__identity_int16_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_int64) +GrB_Info GB (_uop_tran__identity_int16_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -602,7 +602,7 @@ GrB_Info GB (_unop_tran__identity_int16_int64) ) ; -GrB_Info GB (_unop_apply__identity_int16_uint8) +GrB_Info GB (_uop_apply__identity_int16_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -611,7 +611,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_uint8) +GrB_Info GB (_uop_tran__identity_int16_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -622,7 +622,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint8) ) ; -GrB_Info GB (_unop_apply__identity_int16_uint16) +GrB_Info GB (_uop_apply__identity_int16_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -631,7 +631,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_uint16) +GrB_Info GB (_uop_tran__identity_int16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -642,7 +642,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint16) ) ; -GrB_Info GB (_unop_apply__identity_int16_uint32) +GrB_Info GB (_uop_apply__identity_int16_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -651,7 +651,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_uint32) +GrB_Info GB (_uop_tran__identity_int16_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -662,7 +662,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint32) ) ; -GrB_Info GB (_unop_apply__identity_int16_uint64) +GrB_Info GB (_uop_apply__identity_int16_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -671,7 +671,7 @@ GrB_Info GB (_unop_apply__identity_int16_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_uint64) +GrB_Info GB (_uop_tran__identity_int16_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -682,7 +682,7 @@ GrB_Info GB (_unop_tran__identity_int16_uint64) ) ; -GrB_Info GB (_unop_apply__identity_int16_fp32) +GrB_Info GB (_uop_apply__identity_int16_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -691,7 +691,7 @@ GrB_Info GB (_unop_apply__identity_int16_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_fp32) +GrB_Info GB (_uop_tran__identity_int16_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -702,7 +702,7 @@ GrB_Info GB (_unop_tran__identity_int16_fp32) ) ; -GrB_Info GB (_unop_apply__identity_int16_fp64) +GrB_Info GB (_uop_apply__identity_int16_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -711,7 +711,7 @@ GrB_Info GB (_unop_apply__identity_int16_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_fp64) +GrB_Info GB (_uop_tran__identity_int16_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -722,7 +722,7 @@ GrB_Info GB (_unop_tran__identity_int16_fp64) ) ; -GrB_Info GB (_unop_apply__identity_int16_fc32) +GrB_Info GB (_uop_apply__identity_int16_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -731,7 +731,7 @@ GrB_Info GB (_unop_apply__identity_int16_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_fc32) +GrB_Info GB (_uop_tran__identity_int16_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -742,7 +742,7 @@ GrB_Info GB (_unop_tran__identity_int16_fc32) ) ; -GrB_Info GB (_unop_apply__identity_int16_fc64) +GrB_Info GB (_uop_apply__identity_int16_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -751,7 +751,7 @@ GrB_Info GB (_unop_apply__identity_int16_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int16_fc64) +GrB_Info GB (_uop_tran__identity_int16_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -762,7 +762,7 @@ GrB_Info GB (_unop_tran__identity_int16_fc64) ) ; -GrB_Info GB (_unop_apply__identity_int32_bool) +GrB_Info GB (_uop_apply__identity_int32_bool) ( GB_void *Cx, const GB_void *Ax, @@ -771,7 +771,7 @@ GrB_Info GB (_unop_apply__identity_int32_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_bool) +GrB_Info GB (_uop_tran__identity_int32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -782,7 +782,7 @@ GrB_Info GB (_unop_tran__identity_int32_bool) ) ; -GrB_Info GB (_unop_apply__identity_int32_int8) +GrB_Info GB (_uop_apply__identity_int32_int8) ( GB_void *Cx, const GB_void *Ax, @@ -791,7 +791,7 @@ GrB_Info GB (_unop_apply__identity_int32_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_int8) +GrB_Info GB (_uop_tran__identity_int32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -802,7 +802,7 @@ GrB_Info GB (_unop_tran__identity_int32_int8) ) ; -GrB_Info GB (_unop_apply__identity_int32_int16) +GrB_Info GB (_uop_apply__identity_int32_int16) ( GB_void *Cx, const GB_void *Ax, @@ -811,7 +811,7 @@ GrB_Info GB (_unop_apply__identity_int32_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_int16) +GrB_Info GB (_uop_tran__identity_int32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -822,7 +822,7 @@ GrB_Info GB (_unop_tran__identity_int32_int16) ) ; -GrB_Info GB (_unop_tran__identity_int32_int32) +GrB_Info GB (_uop_tran__identity_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -833,7 +833,7 @@ GrB_Info GB (_unop_tran__identity_int32_int32) ) ; -GrB_Info GB (_unop_apply__identity_int32_int64) +GrB_Info GB (_uop_apply__identity_int32_int64) ( GB_void *Cx, const GB_void *Ax, @@ -842,7 +842,7 @@ GrB_Info GB (_unop_apply__identity_int32_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_int64) +GrB_Info GB (_uop_tran__identity_int32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -853,7 +853,7 @@ GrB_Info GB (_unop_tran__identity_int32_int64) ) ; -GrB_Info GB (_unop_apply__identity_int32_uint8) +GrB_Info GB (_uop_apply__identity_int32_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -862,7 +862,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_uint8) +GrB_Info GB (_uop_tran__identity_int32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -873,7 +873,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint8) ) ; -GrB_Info GB (_unop_apply__identity_int32_uint16) +GrB_Info GB (_uop_apply__identity_int32_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -882,7 +882,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_uint16) +GrB_Info GB (_uop_tran__identity_int32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -893,7 +893,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint16) ) ; -GrB_Info GB (_unop_apply__identity_int32_uint32) +GrB_Info GB (_uop_apply__identity_int32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -902,7 +902,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_uint32) +GrB_Info GB (_uop_tran__identity_int32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -913,7 +913,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint32) ) ; -GrB_Info GB (_unop_apply__identity_int32_uint64) +GrB_Info GB (_uop_apply__identity_int32_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -922,7 +922,7 @@ GrB_Info GB (_unop_apply__identity_int32_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_uint64) +GrB_Info GB (_uop_tran__identity_int32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -933,7 +933,7 @@ GrB_Info GB (_unop_tran__identity_int32_uint64) ) ; -GrB_Info GB (_unop_apply__identity_int32_fp32) +GrB_Info GB (_uop_apply__identity_int32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -942,7 +942,7 @@ GrB_Info GB (_unop_apply__identity_int32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_fp32) +GrB_Info GB (_uop_tran__identity_int32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -953,7 +953,7 @@ GrB_Info GB (_unop_tran__identity_int32_fp32) ) ; -GrB_Info GB (_unop_apply__identity_int32_fp64) +GrB_Info GB (_uop_apply__identity_int32_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -962,7 +962,7 @@ GrB_Info GB (_unop_apply__identity_int32_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_fp64) +GrB_Info GB (_uop_tran__identity_int32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -973,7 +973,7 @@ GrB_Info GB (_unop_tran__identity_int32_fp64) ) ; -GrB_Info GB (_unop_apply__identity_int32_fc32) +GrB_Info GB (_uop_apply__identity_int32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -982,7 +982,7 @@ GrB_Info GB (_unop_apply__identity_int32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_fc32) +GrB_Info GB (_uop_tran__identity_int32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -993,7 +993,7 @@ GrB_Info GB (_unop_tran__identity_int32_fc32) ) ; -GrB_Info GB (_unop_apply__identity_int32_fc64) +GrB_Info GB (_uop_apply__identity_int32_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -1002,7 +1002,7 @@ GrB_Info GB (_unop_apply__identity_int32_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int32_fc64) +GrB_Info GB (_uop_tran__identity_int32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1013,7 +1013,7 @@ GrB_Info GB (_unop_tran__identity_int32_fc64) ) ; -GrB_Info GB (_unop_apply__identity_int64_bool) +GrB_Info GB (_uop_apply__identity_int64_bool) ( GB_void *Cx, const GB_void *Ax, @@ -1022,7 +1022,7 @@ GrB_Info GB (_unop_apply__identity_int64_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_bool) +GrB_Info GB (_uop_tran__identity_int64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -1033,7 +1033,7 @@ GrB_Info GB (_unop_tran__identity_int64_bool) ) ; -GrB_Info GB (_unop_apply__identity_int64_int8) +GrB_Info GB (_uop_apply__identity_int64_int8) ( GB_void *Cx, const GB_void *Ax, @@ -1042,7 +1042,7 @@ GrB_Info GB (_unop_apply__identity_int64_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_int8) +GrB_Info GB (_uop_tran__identity_int64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1053,7 +1053,7 @@ GrB_Info GB (_unop_tran__identity_int64_int8) ) ; -GrB_Info GB (_unop_apply__identity_int64_int16) +GrB_Info GB (_uop_apply__identity_int64_int16) ( GB_void *Cx, const GB_void *Ax, @@ -1062,7 +1062,7 @@ GrB_Info GB (_unop_apply__identity_int64_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_int16) +GrB_Info GB (_uop_tran__identity_int64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1073,7 +1073,7 @@ GrB_Info GB (_unop_tran__identity_int64_int16) ) ; -GrB_Info GB (_unop_apply__identity_int64_int32) +GrB_Info GB (_uop_apply__identity_int64_int32) ( GB_void *Cx, const GB_void *Ax, @@ -1082,7 +1082,7 @@ GrB_Info GB (_unop_apply__identity_int64_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_int32) +GrB_Info GB (_uop_tran__identity_int64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1093,7 +1093,7 @@ GrB_Info GB (_unop_tran__identity_int64_int32) ) ; -GrB_Info GB (_unop_tran__identity_int64_int64) +GrB_Info GB (_uop_tran__identity_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1104,7 +1104,7 @@ GrB_Info GB (_unop_tran__identity_int64_int64) ) ; -GrB_Info GB (_unop_apply__identity_int64_uint8) +GrB_Info GB (_uop_apply__identity_int64_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -1113,7 +1113,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_uint8) +GrB_Info GB (_uop_tran__identity_int64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1124,7 +1124,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint8) ) ; -GrB_Info GB (_unop_apply__identity_int64_uint16) +GrB_Info GB (_uop_apply__identity_int64_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -1133,7 +1133,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_uint16) +GrB_Info GB (_uop_tran__identity_int64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1144,7 +1144,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint16) ) ; -GrB_Info GB (_unop_apply__identity_int64_uint32) +GrB_Info GB (_uop_apply__identity_int64_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -1153,7 +1153,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_uint32) +GrB_Info GB (_uop_tran__identity_int64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1164,7 +1164,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint32) ) ; -GrB_Info GB (_unop_apply__identity_int64_uint64) +GrB_Info GB (_uop_apply__identity_int64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -1173,7 +1173,7 @@ GrB_Info GB (_unop_apply__identity_int64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_uint64) +GrB_Info GB (_uop_tran__identity_int64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1184,7 +1184,7 @@ GrB_Info GB (_unop_tran__identity_int64_uint64) ) ; -GrB_Info GB (_unop_apply__identity_int64_fp32) +GrB_Info GB (_uop_apply__identity_int64_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -1193,7 +1193,7 @@ GrB_Info GB (_unop_apply__identity_int64_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_fp32) +GrB_Info GB (_uop_tran__identity_int64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1204,7 +1204,7 @@ GrB_Info GB (_unop_tran__identity_int64_fp32) ) ; -GrB_Info GB (_unop_apply__identity_int64_fp64) +GrB_Info GB (_uop_apply__identity_int64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -1213,7 +1213,7 @@ GrB_Info GB (_unop_apply__identity_int64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_fp64) +GrB_Info GB (_uop_tran__identity_int64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1224,7 +1224,7 @@ GrB_Info GB (_unop_tran__identity_int64_fp64) ) ; -GrB_Info GB (_unop_apply__identity_int64_fc32) +GrB_Info GB (_uop_apply__identity_int64_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -1233,7 +1233,7 @@ GrB_Info GB (_unop_apply__identity_int64_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_fc32) +GrB_Info GB (_uop_tran__identity_int64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1244,7 +1244,7 @@ GrB_Info GB (_unop_tran__identity_int64_fc32) ) ; -GrB_Info GB (_unop_apply__identity_int64_fc64) +GrB_Info GB (_uop_apply__identity_int64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -1253,7 +1253,7 @@ GrB_Info GB (_unop_apply__identity_int64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_int64_fc64) +GrB_Info GB (_uop_tran__identity_int64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1264,7 +1264,7 @@ GrB_Info GB (_unop_tran__identity_int64_fc64) ) ; -GrB_Info GB (_unop_apply__identity_uint8_bool) +GrB_Info GB (_uop_apply__identity_uint8_bool) ( GB_void *Cx, const GB_void *Ax, @@ -1273,7 +1273,7 @@ GrB_Info GB (_unop_apply__identity_uint8_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_bool) +GrB_Info GB (_uop_tran__identity_uint8_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -1284,7 +1284,7 @@ GrB_Info GB (_unop_tran__identity_uint8_bool) ) ; -GrB_Info GB (_unop_apply__identity_uint8_int8) +GrB_Info GB (_uop_apply__identity_uint8_int8) ( GB_void *Cx, const GB_void *Ax, @@ -1293,7 +1293,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_int8) +GrB_Info GB (_uop_tran__identity_uint8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1304,7 +1304,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int8) ) ; -GrB_Info GB (_unop_apply__identity_uint8_int16) +GrB_Info GB (_uop_apply__identity_uint8_int16) ( GB_void *Cx, const GB_void *Ax, @@ -1313,7 +1313,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_int16) +GrB_Info GB (_uop_tran__identity_uint8_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1324,7 +1324,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int16) ) ; -GrB_Info GB (_unop_apply__identity_uint8_int32) +GrB_Info GB (_uop_apply__identity_uint8_int32) ( GB_void *Cx, const GB_void *Ax, @@ -1333,7 +1333,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_int32) +GrB_Info GB (_uop_tran__identity_uint8_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1344,7 +1344,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int32) ) ; -GrB_Info GB (_unop_apply__identity_uint8_int64) +GrB_Info GB (_uop_apply__identity_uint8_int64) ( GB_void *Cx, const GB_void *Ax, @@ -1353,7 +1353,7 @@ GrB_Info GB (_unop_apply__identity_uint8_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_int64) +GrB_Info GB (_uop_tran__identity_uint8_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1364,7 +1364,7 @@ GrB_Info GB (_unop_tran__identity_uint8_int64) ) ; -GrB_Info GB (_unop_tran__identity_uint8_uint8) +GrB_Info GB (_uop_tran__identity_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1375,7 +1375,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint8) ) ; -GrB_Info GB (_unop_apply__identity_uint8_uint16) +GrB_Info GB (_uop_apply__identity_uint8_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -1384,7 +1384,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_uint16) +GrB_Info GB (_uop_tran__identity_uint8_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1395,7 +1395,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint16) ) ; -GrB_Info GB (_unop_apply__identity_uint8_uint32) +GrB_Info GB (_uop_apply__identity_uint8_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -1404,7 +1404,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_uint32) +GrB_Info GB (_uop_tran__identity_uint8_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1415,7 +1415,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint32) ) ; -GrB_Info GB (_unop_apply__identity_uint8_uint64) +GrB_Info GB (_uop_apply__identity_uint8_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -1424,7 +1424,7 @@ GrB_Info GB (_unop_apply__identity_uint8_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_uint64) +GrB_Info GB (_uop_tran__identity_uint8_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1435,7 +1435,7 @@ GrB_Info GB (_unop_tran__identity_uint8_uint64) ) ; -GrB_Info GB (_unop_apply__identity_uint8_fp32) +GrB_Info GB (_uop_apply__identity_uint8_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -1444,7 +1444,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_fp32) +GrB_Info GB (_uop_tran__identity_uint8_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1455,7 +1455,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fp32) ) ; -GrB_Info GB (_unop_apply__identity_uint8_fp64) +GrB_Info GB (_uop_apply__identity_uint8_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -1464,7 +1464,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_fp64) +GrB_Info GB (_uop_tran__identity_uint8_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1475,7 +1475,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fp64) ) ; -GrB_Info GB (_unop_apply__identity_uint8_fc32) +GrB_Info GB (_uop_apply__identity_uint8_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -1484,7 +1484,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_fc32) +GrB_Info GB (_uop_tran__identity_uint8_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1495,7 +1495,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fc32) ) ; -GrB_Info GB (_unop_apply__identity_uint8_fc64) +GrB_Info GB (_uop_apply__identity_uint8_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -1504,7 +1504,7 @@ GrB_Info GB (_unop_apply__identity_uint8_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint8_fc64) +GrB_Info GB (_uop_tran__identity_uint8_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1515,7 +1515,7 @@ GrB_Info GB (_unop_tran__identity_uint8_fc64) ) ; -GrB_Info GB (_unop_apply__identity_uint16_bool) +GrB_Info GB (_uop_apply__identity_uint16_bool) ( GB_void *Cx, const GB_void *Ax, @@ -1524,7 +1524,7 @@ GrB_Info GB (_unop_apply__identity_uint16_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_bool) +GrB_Info GB (_uop_tran__identity_uint16_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -1535,7 +1535,7 @@ GrB_Info GB (_unop_tran__identity_uint16_bool) ) ; -GrB_Info GB (_unop_apply__identity_uint16_int8) +GrB_Info GB (_uop_apply__identity_uint16_int8) ( GB_void *Cx, const GB_void *Ax, @@ -1544,7 +1544,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_int8) +GrB_Info GB (_uop_tran__identity_uint16_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1555,7 +1555,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int8) ) ; -GrB_Info GB (_unop_apply__identity_uint16_int16) +GrB_Info GB (_uop_apply__identity_uint16_int16) ( GB_void *Cx, const GB_void *Ax, @@ -1564,7 +1564,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_int16) +GrB_Info GB (_uop_tran__identity_uint16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1575,7 +1575,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int16) ) ; -GrB_Info GB (_unop_apply__identity_uint16_int32) +GrB_Info GB (_uop_apply__identity_uint16_int32) ( GB_void *Cx, const GB_void *Ax, @@ -1584,7 +1584,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_int32) +GrB_Info GB (_uop_tran__identity_uint16_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1595,7 +1595,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int32) ) ; -GrB_Info GB (_unop_apply__identity_uint16_int64) +GrB_Info GB (_uop_apply__identity_uint16_int64) ( GB_void *Cx, const GB_void *Ax, @@ -1604,7 +1604,7 @@ GrB_Info GB (_unop_apply__identity_uint16_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_int64) +GrB_Info GB (_uop_tran__identity_uint16_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1615,7 +1615,7 @@ GrB_Info GB (_unop_tran__identity_uint16_int64) ) ; -GrB_Info GB (_unop_apply__identity_uint16_uint8) +GrB_Info GB (_uop_apply__identity_uint16_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -1624,7 +1624,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_uint8) +GrB_Info GB (_uop_tran__identity_uint16_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1635,7 +1635,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint8) ) ; -GrB_Info GB (_unop_tran__identity_uint16_uint16) +GrB_Info GB (_uop_tran__identity_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1646,7 +1646,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint16) ) ; -GrB_Info GB (_unop_apply__identity_uint16_uint32) +GrB_Info GB (_uop_apply__identity_uint16_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -1655,7 +1655,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_uint32) +GrB_Info GB (_uop_tran__identity_uint16_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1666,7 +1666,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint32) ) ; -GrB_Info GB (_unop_apply__identity_uint16_uint64) +GrB_Info GB (_uop_apply__identity_uint16_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -1675,7 +1675,7 @@ GrB_Info GB (_unop_apply__identity_uint16_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_uint64) +GrB_Info GB (_uop_tran__identity_uint16_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1686,7 +1686,7 @@ GrB_Info GB (_unop_tran__identity_uint16_uint64) ) ; -GrB_Info GB (_unop_apply__identity_uint16_fp32) +GrB_Info GB (_uop_apply__identity_uint16_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -1695,7 +1695,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_fp32) +GrB_Info GB (_uop_tran__identity_uint16_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1706,7 +1706,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fp32) ) ; -GrB_Info GB (_unop_apply__identity_uint16_fp64) +GrB_Info GB (_uop_apply__identity_uint16_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -1715,7 +1715,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_fp64) +GrB_Info GB (_uop_tran__identity_uint16_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1726,7 +1726,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fp64) ) ; -GrB_Info GB (_unop_apply__identity_uint16_fc32) +GrB_Info GB (_uop_apply__identity_uint16_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -1735,7 +1735,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_fc32) +GrB_Info GB (_uop_tran__identity_uint16_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1746,7 +1746,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fc32) ) ; -GrB_Info GB (_unop_apply__identity_uint16_fc64) +GrB_Info GB (_uop_apply__identity_uint16_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -1755,7 +1755,7 @@ GrB_Info GB (_unop_apply__identity_uint16_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint16_fc64) +GrB_Info GB (_uop_tran__identity_uint16_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1766,7 +1766,7 @@ GrB_Info GB (_unop_tran__identity_uint16_fc64) ) ; -GrB_Info GB (_unop_apply__identity_uint32_bool) +GrB_Info GB (_uop_apply__identity_uint32_bool) ( GB_void *Cx, const GB_void *Ax, @@ -1775,7 +1775,7 @@ GrB_Info GB (_unop_apply__identity_uint32_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_bool) +GrB_Info GB (_uop_tran__identity_uint32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -1786,7 +1786,7 @@ GrB_Info GB (_unop_tran__identity_uint32_bool) ) ; -GrB_Info GB (_unop_apply__identity_uint32_int8) +GrB_Info GB (_uop_apply__identity_uint32_int8) ( GB_void *Cx, const GB_void *Ax, @@ -1795,7 +1795,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_int8) +GrB_Info GB (_uop_tran__identity_uint32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1806,7 +1806,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int8) ) ; -GrB_Info GB (_unop_apply__identity_uint32_int16) +GrB_Info GB (_uop_apply__identity_uint32_int16) ( GB_void *Cx, const GB_void *Ax, @@ -1815,7 +1815,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_int16) +GrB_Info GB (_uop_tran__identity_uint32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1826,7 +1826,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int16) ) ; -GrB_Info GB (_unop_apply__identity_uint32_int32) +GrB_Info GB (_uop_apply__identity_uint32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -1835,7 +1835,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_int32) +GrB_Info GB (_uop_tran__identity_uint32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1846,7 +1846,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int32) ) ; -GrB_Info GB (_unop_apply__identity_uint32_int64) +GrB_Info GB (_uop_apply__identity_uint32_int64) ( GB_void *Cx, const GB_void *Ax, @@ -1855,7 +1855,7 @@ GrB_Info GB (_unop_apply__identity_uint32_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_int64) +GrB_Info GB (_uop_tran__identity_uint32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1866,7 +1866,7 @@ GrB_Info GB (_unop_tran__identity_uint32_int64) ) ; -GrB_Info GB (_unop_apply__identity_uint32_uint8) +GrB_Info GB (_uop_apply__identity_uint32_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -1875,7 +1875,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_uint8) +GrB_Info GB (_uop_tran__identity_uint32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -1886,7 +1886,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint8) ) ; -GrB_Info GB (_unop_apply__identity_uint32_uint16) +GrB_Info GB (_uop_apply__identity_uint32_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -1895,7 +1895,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_uint16) +GrB_Info GB (_uop_tran__identity_uint32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -1906,7 +1906,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint16) ) ; -GrB_Info GB (_unop_tran__identity_uint32_uint32) +GrB_Info GB (_uop_tran__identity_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1917,7 +1917,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint32) ) ; -GrB_Info GB (_unop_apply__identity_uint32_uint64) +GrB_Info GB (_uop_apply__identity_uint32_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -1926,7 +1926,7 @@ GrB_Info GB (_unop_apply__identity_uint32_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_uint64) +GrB_Info GB (_uop_tran__identity_uint32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1937,7 +1937,7 @@ GrB_Info GB (_unop_tran__identity_uint32_uint64) ) ; -GrB_Info GB (_unop_apply__identity_uint32_fp32) +GrB_Info GB (_uop_apply__identity_uint32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -1946,7 +1946,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_fp32) +GrB_Info GB (_uop_tran__identity_uint32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1957,7 +1957,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fp32) ) ; -GrB_Info GB (_unop_apply__identity_uint32_fp64) +GrB_Info GB (_uop_apply__identity_uint32_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -1966,7 +1966,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_fp64) +GrB_Info GB (_uop_tran__identity_uint32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -1977,7 +1977,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fp64) ) ; -GrB_Info GB (_unop_apply__identity_uint32_fc32) +GrB_Info GB (_uop_apply__identity_uint32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -1986,7 +1986,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_fc32) +GrB_Info GB (_uop_tran__identity_uint32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -1997,7 +1997,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fc32) ) ; -GrB_Info GB (_unop_apply__identity_uint32_fc64) +GrB_Info GB (_uop_apply__identity_uint32_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -2006,7 +2006,7 @@ GrB_Info GB (_unop_apply__identity_uint32_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint32_fc64) +GrB_Info GB (_uop_tran__identity_uint32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2017,7 +2017,7 @@ GrB_Info GB (_unop_tran__identity_uint32_fc64) ) ; -GrB_Info GB (_unop_apply__identity_uint64_bool) +GrB_Info GB (_uop_apply__identity_uint64_bool) ( GB_void *Cx, const GB_void *Ax, @@ -2026,7 +2026,7 @@ GrB_Info GB (_unop_apply__identity_uint64_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_bool) +GrB_Info GB (_uop_tran__identity_uint64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -2037,7 +2037,7 @@ GrB_Info GB (_unop_tran__identity_uint64_bool) ) ; -GrB_Info GB (_unop_apply__identity_uint64_int8) +GrB_Info GB (_uop_apply__identity_uint64_int8) ( GB_void *Cx, const GB_void *Ax, @@ -2046,7 +2046,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_int8) +GrB_Info GB (_uop_tran__identity_uint64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2057,7 +2057,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int8) ) ; -GrB_Info GB (_unop_apply__identity_uint64_int16) +GrB_Info GB (_uop_apply__identity_uint64_int16) ( GB_void *Cx, const GB_void *Ax, @@ -2066,7 +2066,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_int16) +GrB_Info GB (_uop_tran__identity_uint64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2077,7 +2077,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int16) ) ; -GrB_Info GB (_unop_apply__identity_uint64_int32) +GrB_Info GB (_uop_apply__identity_uint64_int32) ( GB_void *Cx, const GB_void *Ax, @@ -2086,7 +2086,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_int32) +GrB_Info GB (_uop_tran__identity_uint64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2097,7 +2097,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int32) ) ; -GrB_Info GB (_unop_apply__identity_uint64_int64) +GrB_Info GB (_uop_apply__identity_uint64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -2106,7 +2106,7 @@ GrB_Info GB (_unop_apply__identity_uint64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_int64) +GrB_Info GB (_uop_tran__identity_uint64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2117,7 +2117,7 @@ GrB_Info GB (_unop_tran__identity_uint64_int64) ) ; -GrB_Info GB (_unop_apply__identity_uint64_uint8) +GrB_Info GB (_uop_apply__identity_uint64_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -2126,7 +2126,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_uint8) +GrB_Info GB (_uop_tran__identity_uint64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2137,7 +2137,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint8) ) ; -GrB_Info GB (_unop_apply__identity_uint64_uint16) +GrB_Info GB (_uop_apply__identity_uint64_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -2146,7 +2146,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_uint16) +GrB_Info GB (_uop_tran__identity_uint64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2157,7 +2157,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint16) ) ; -GrB_Info GB (_unop_apply__identity_uint64_uint32) +GrB_Info GB (_uop_apply__identity_uint64_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -2166,7 +2166,7 @@ GrB_Info GB (_unop_apply__identity_uint64_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_uint32) +GrB_Info GB (_uop_tran__identity_uint64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2177,7 +2177,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint32) ) ; -GrB_Info GB (_unop_tran__identity_uint64_uint64) +GrB_Info GB (_uop_tran__identity_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2188,7 +2188,7 @@ GrB_Info GB (_unop_tran__identity_uint64_uint64) ) ; -GrB_Info GB (_unop_apply__identity_uint64_fp32) +GrB_Info GB (_uop_apply__identity_uint64_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -2197,7 +2197,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_fp32) +GrB_Info GB (_uop_tran__identity_uint64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2208,7 +2208,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fp32) ) ; -GrB_Info GB (_unop_apply__identity_uint64_fp64) +GrB_Info GB (_uop_apply__identity_uint64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -2217,7 +2217,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_fp64) +GrB_Info GB (_uop_tran__identity_uint64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2228,7 +2228,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fp64) ) ; -GrB_Info GB (_unop_apply__identity_uint64_fc32) +GrB_Info GB (_uop_apply__identity_uint64_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -2237,7 +2237,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_fc32) +GrB_Info GB (_uop_tran__identity_uint64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2248,7 +2248,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fc32) ) ; -GrB_Info GB (_unop_apply__identity_uint64_fc64) +GrB_Info GB (_uop_apply__identity_uint64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -2257,7 +2257,7 @@ GrB_Info GB (_unop_apply__identity_uint64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_uint64_fc64) +GrB_Info GB (_uop_tran__identity_uint64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2268,7 +2268,7 @@ GrB_Info GB (_unop_tran__identity_uint64_fc64) ) ; -GrB_Info GB (_unop_apply__identity_fp32_bool) +GrB_Info GB (_uop_apply__identity_fp32_bool) ( GB_void *Cx, const GB_void *Ax, @@ -2277,7 +2277,7 @@ GrB_Info GB (_unop_apply__identity_fp32_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_bool) +GrB_Info GB (_uop_tran__identity_fp32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -2288,7 +2288,7 @@ GrB_Info GB (_unop_tran__identity_fp32_bool) ) ; -GrB_Info GB (_unop_apply__identity_fp32_int8) +GrB_Info GB (_uop_apply__identity_fp32_int8) ( GB_void *Cx, const GB_void *Ax, @@ -2297,7 +2297,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_int8) +GrB_Info GB (_uop_tran__identity_fp32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2308,7 +2308,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int8) ) ; -GrB_Info GB (_unop_apply__identity_fp32_int16) +GrB_Info GB (_uop_apply__identity_fp32_int16) ( GB_void *Cx, const GB_void *Ax, @@ -2317,7 +2317,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_int16) +GrB_Info GB (_uop_tran__identity_fp32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2328,7 +2328,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int16) ) ; -GrB_Info GB (_unop_apply__identity_fp32_int32) +GrB_Info GB (_uop_apply__identity_fp32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -2337,7 +2337,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_int32) +GrB_Info GB (_uop_tran__identity_fp32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2348,7 +2348,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int32) ) ; -GrB_Info GB (_unop_apply__identity_fp32_int64) +GrB_Info GB (_uop_apply__identity_fp32_int64) ( GB_void *Cx, const GB_void *Ax, @@ -2357,7 +2357,7 @@ GrB_Info GB (_unop_apply__identity_fp32_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_int64) +GrB_Info GB (_uop_tran__identity_fp32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2368,7 +2368,7 @@ GrB_Info GB (_unop_tran__identity_fp32_int64) ) ; -GrB_Info GB (_unop_apply__identity_fp32_uint8) +GrB_Info GB (_uop_apply__identity_fp32_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -2377,7 +2377,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_uint8) +GrB_Info GB (_uop_tran__identity_fp32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2388,7 +2388,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint8) ) ; -GrB_Info GB (_unop_apply__identity_fp32_uint16) +GrB_Info GB (_uop_apply__identity_fp32_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -2397,7 +2397,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_uint16) +GrB_Info GB (_uop_tran__identity_fp32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2408,7 +2408,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint16) ) ; -GrB_Info GB (_unop_apply__identity_fp32_uint32) +GrB_Info GB (_uop_apply__identity_fp32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -2417,7 +2417,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_uint32) +GrB_Info GB (_uop_tran__identity_fp32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2428,7 +2428,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint32) ) ; -GrB_Info GB (_unop_apply__identity_fp32_uint64) +GrB_Info GB (_uop_apply__identity_fp32_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -2437,7 +2437,7 @@ GrB_Info GB (_unop_apply__identity_fp32_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_uint64) +GrB_Info GB (_uop_tran__identity_fp32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2448,7 +2448,7 @@ GrB_Info GB (_unop_tran__identity_fp32_uint64) ) ; -GrB_Info GB (_unop_tran__identity_fp32_fp32) +GrB_Info GB (_uop_tran__identity_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2459,7 +2459,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__identity_fp32_fp64) +GrB_Info GB (_uop_apply__identity_fp32_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -2468,7 +2468,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_fp64) +GrB_Info GB (_uop_tran__identity_fp32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2479,7 +2479,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fp64) ) ; -GrB_Info GB (_unop_apply__identity_fp32_fc32) +GrB_Info GB (_uop_apply__identity_fp32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -2488,7 +2488,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_fc32) +GrB_Info GB (_uop_tran__identity_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2499,7 +2499,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fc32) ) ; -GrB_Info GB (_unop_apply__identity_fp32_fc64) +GrB_Info GB (_uop_apply__identity_fp32_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -2508,7 +2508,7 @@ GrB_Info GB (_unop_apply__identity_fp32_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp32_fc64) +GrB_Info GB (_uop_tran__identity_fp32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2519,7 +2519,7 @@ GrB_Info GB (_unop_tran__identity_fp32_fc64) ) ; -GrB_Info GB (_unop_apply__identity_fp64_bool) +GrB_Info GB (_uop_apply__identity_fp64_bool) ( GB_void *Cx, const GB_void *Ax, @@ -2528,7 +2528,7 @@ GrB_Info GB (_unop_apply__identity_fp64_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_bool) +GrB_Info GB (_uop_tran__identity_fp64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -2539,7 +2539,7 @@ GrB_Info GB (_unop_tran__identity_fp64_bool) ) ; -GrB_Info GB (_unop_apply__identity_fp64_int8) +GrB_Info GB (_uop_apply__identity_fp64_int8) ( GB_void *Cx, const GB_void *Ax, @@ -2548,7 +2548,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_int8) +GrB_Info GB (_uop_tran__identity_fp64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2559,7 +2559,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int8) ) ; -GrB_Info GB (_unop_apply__identity_fp64_int16) +GrB_Info GB (_uop_apply__identity_fp64_int16) ( GB_void *Cx, const GB_void *Ax, @@ -2568,7 +2568,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_int16) +GrB_Info GB (_uop_tran__identity_fp64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2579,7 +2579,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int16) ) ; -GrB_Info GB (_unop_apply__identity_fp64_int32) +GrB_Info GB (_uop_apply__identity_fp64_int32) ( GB_void *Cx, const GB_void *Ax, @@ -2588,7 +2588,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_int32) +GrB_Info GB (_uop_tran__identity_fp64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2599,7 +2599,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int32) ) ; -GrB_Info GB (_unop_apply__identity_fp64_int64) +GrB_Info GB (_uop_apply__identity_fp64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -2608,7 +2608,7 @@ GrB_Info GB (_unop_apply__identity_fp64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_int64) +GrB_Info GB (_uop_tran__identity_fp64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2619,7 +2619,7 @@ GrB_Info GB (_unop_tran__identity_fp64_int64) ) ; -GrB_Info GB (_unop_apply__identity_fp64_uint8) +GrB_Info GB (_uop_apply__identity_fp64_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -2628,7 +2628,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_uint8) +GrB_Info GB (_uop_tran__identity_fp64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2639,7 +2639,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint8) ) ; -GrB_Info GB (_unop_apply__identity_fp64_uint16) +GrB_Info GB (_uop_apply__identity_fp64_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -2648,7 +2648,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_uint16) +GrB_Info GB (_uop_tran__identity_fp64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2659,7 +2659,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint16) ) ; -GrB_Info GB (_unop_apply__identity_fp64_uint32) +GrB_Info GB (_uop_apply__identity_fp64_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -2668,7 +2668,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_uint32) +GrB_Info GB (_uop_tran__identity_fp64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2679,7 +2679,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint32) ) ; -GrB_Info GB (_unop_apply__identity_fp64_uint64) +GrB_Info GB (_uop_apply__identity_fp64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -2688,7 +2688,7 @@ GrB_Info GB (_unop_apply__identity_fp64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_uint64) +GrB_Info GB (_uop_tran__identity_fp64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2699,7 +2699,7 @@ GrB_Info GB (_unop_tran__identity_fp64_uint64) ) ; -GrB_Info GB (_unop_apply__identity_fp64_fp32) +GrB_Info GB (_uop_apply__identity_fp64_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -2708,7 +2708,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_fp32) +GrB_Info GB (_uop_tran__identity_fp64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2719,7 +2719,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fp32) ) ; -GrB_Info GB (_unop_tran__identity_fp64_fp64) +GrB_Info GB (_uop_tran__identity_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2730,7 +2730,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__identity_fp64_fc32) +GrB_Info GB (_uop_apply__identity_fp64_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -2739,7 +2739,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_fc32) +GrB_Info GB (_uop_tran__identity_fp64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2750,7 +2750,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fc32) ) ; -GrB_Info GB (_unop_apply__identity_fp64_fc64) +GrB_Info GB (_uop_apply__identity_fp64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -2759,7 +2759,7 @@ GrB_Info GB (_unop_apply__identity_fp64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fp64_fc64) +GrB_Info GB (_uop_tran__identity_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2770,7 +2770,7 @@ GrB_Info GB (_unop_tran__identity_fp64_fc64) ) ; -GrB_Info GB (_unop_apply__identity_fc32_bool) +GrB_Info GB (_uop_apply__identity_fc32_bool) ( GB_void *Cx, const GB_void *Ax, @@ -2779,7 +2779,7 @@ GrB_Info GB (_unop_apply__identity_fc32_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_bool) +GrB_Info GB (_uop_tran__identity_fc32_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -2790,7 +2790,7 @@ GrB_Info GB (_unop_tran__identity_fc32_bool) ) ; -GrB_Info GB (_unop_apply__identity_fc32_int8) +GrB_Info GB (_uop_apply__identity_fc32_int8) ( GB_void *Cx, const GB_void *Ax, @@ -2799,7 +2799,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_int8) +GrB_Info GB (_uop_tran__identity_fc32_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2810,7 +2810,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int8) ) ; -GrB_Info GB (_unop_apply__identity_fc32_int16) +GrB_Info GB (_uop_apply__identity_fc32_int16) ( GB_void *Cx, const GB_void *Ax, @@ -2819,7 +2819,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_int16) +GrB_Info GB (_uop_tran__identity_fc32_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2830,7 +2830,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int16) ) ; -GrB_Info GB (_unop_apply__identity_fc32_int32) +GrB_Info GB (_uop_apply__identity_fc32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -2839,7 +2839,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_int32) +GrB_Info GB (_uop_tran__identity_fc32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2850,7 +2850,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int32) ) ; -GrB_Info GB (_unop_apply__identity_fc32_int64) +GrB_Info GB (_uop_apply__identity_fc32_int64) ( GB_void *Cx, const GB_void *Ax, @@ -2859,7 +2859,7 @@ GrB_Info GB (_unop_apply__identity_fc32_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_int64) +GrB_Info GB (_uop_tran__identity_fc32_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2870,7 +2870,7 @@ GrB_Info GB (_unop_tran__identity_fc32_int64) ) ; -GrB_Info GB (_unop_apply__identity_fc32_uint8) +GrB_Info GB (_uop_apply__identity_fc32_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -2879,7 +2879,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_uint8) +GrB_Info GB (_uop_tran__identity_fc32_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -2890,7 +2890,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint8) ) ; -GrB_Info GB (_unop_apply__identity_fc32_uint16) +GrB_Info GB (_uop_apply__identity_fc32_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -2899,7 +2899,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_uint16) +GrB_Info GB (_uop_tran__identity_fc32_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -2910,7 +2910,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint16) ) ; -GrB_Info GB (_unop_apply__identity_fc32_uint32) +GrB_Info GB (_uop_apply__identity_fc32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -2919,7 +2919,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_uint32) +GrB_Info GB (_uop_tran__identity_fc32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2930,7 +2930,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint32) ) ; -GrB_Info GB (_unop_apply__identity_fc32_uint64) +GrB_Info GB (_uop_apply__identity_fc32_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -2939,7 +2939,7 @@ GrB_Info GB (_unop_apply__identity_fc32_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_uint64) +GrB_Info GB (_uop_tran__identity_fc32_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2950,7 +2950,7 @@ GrB_Info GB (_unop_tran__identity_fc32_uint64) ) ; -GrB_Info GB (_unop_apply__identity_fc32_fp32) +GrB_Info GB (_uop_apply__identity_fc32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -2959,7 +2959,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_fp32) +GrB_Info GB (_uop_tran__identity_fc32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -2970,7 +2970,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fp32) ) ; -GrB_Info GB (_unop_apply__identity_fc32_fp64) +GrB_Info GB (_uop_apply__identity_fc32_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -2979,7 +2979,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_fp64) +GrB_Info GB (_uop_tran__identity_fc32_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -2990,7 +2990,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fp64) ) ; -GrB_Info GB (_unop_tran__identity_fc32_fc32) +GrB_Info GB (_uop_tran__identity_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3001,7 +3001,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__identity_fc32_fc64) +GrB_Info GB (_uop_apply__identity_fc32_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -3010,7 +3010,7 @@ GrB_Info GB (_unop_apply__identity_fc32_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc32_fc64) +GrB_Info GB (_uop_tran__identity_fc32_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3021,7 +3021,7 @@ GrB_Info GB (_unop_tran__identity_fc32_fc64) ) ; -GrB_Info GB (_unop_apply__identity_fc64_bool) +GrB_Info GB (_uop_apply__identity_fc64_bool) ( GB_void *Cx, const GB_void *Ax, @@ -3030,7 +3030,7 @@ GrB_Info GB (_unop_apply__identity_fc64_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_bool) +GrB_Info GB (_uop_tran__identity_fc64_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -3041,7 +3041,7 @@ GrB_Info GB (_unop_tran__identity_fc64_bool) ) ; -GrB_Info GB (_unop_apply__identity_fc64_int8) +GrB_Info GB (_uop_apply__identity_fc64_int8) ( GB_void *Cx, const GB_void *Ax, @@ -3050,7 +3050,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_int8) +GrB_Info GB (_uop_tran__identity_fc64_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3061,7 +3061,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int8) ) ; -GrB_Info GB (_unop_apply__identity_fc64_int16) +GrB_Info GB (_uop_apply__identity_fc64_int16) ( GB_void *Cx, const GB_void *Ax, @@ -3070,7 +3070,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_int16) +GrB_Info GB (_uop_tran__identity_fc64_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3081,7 +3081,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int16) ) ; -GrB_Info GB (_unop_apply__identity_fc64_int32) +GrB_Info GB (_uop_apply__identity_fc64_int32) ( GB_void *Cx, const GB_void *Ax, @@ -3090,7 +3090,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_int32) +GrB_Info GB (_uop_tran__identity_fc64_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3101,7 +3101,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int32) ) ; -GrB_Info GB (_unop_apply__identity_fc64_int64) +GrB_Info GB (_uop_apply__identity_fc64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -3110,7 +3110,7 @@ GrB_Info GB (_unop_apply__identity_fc64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_int64) +GrB_Info GB (_uop_tran__identity_fc64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3121,7 +3121,7 @@ GrB_Info GB (_unop_tran__identity_fc64_int64) ) ; -GrB_Info GB (_unop_apply__identity_fc64_uint8) +GrB_Info GB (_uop_apply__identity_fc64_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -3130,7 +3130,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_uint8) +GrB_Info GB (_uop_tran__identity_fc64_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3141,7 +3141,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint8) ) ; -GrB_Info GB (_unop_apply__identity_fc64_uint16) +GrB_Info GB (_uop_apply__identity_fc64_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -3150,7 +3150,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_uint16) +GrB_Info GB (_uop_tran__identity_fc64_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3161,7 +3161,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint16) ) ; -GrB_Info GB (_unop_apply__identity_fc64_uint32) +GrB_Info GB (_uop_apply__identity_fc64_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -3170,7 +3170,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_uint32) +GrB_Info GB (_uop_tran__identity_fc64_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3181,7 +3181,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint32) ) ; -GrB_Info GB (_unop_apply__identity_fc64_uint64) +GrB_Info GB (_uop_apply__identity_fc64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -3190,7 +3190,7 @@ GrB_Info GB (_unop_apply__identity_fc64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_uint64) +GrB_Info GB (_uop_tran__identity_fc64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3201,7 +3201,7 @@ GrB_Info GB (_unop_tran__identity_fc64_uint64) ) ; -GrB_Info GB (_unop_apply__identity_fc64_fp32) +GrB_Info GB (_uop_apply__identity_fc64_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -3210,7 +3210,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_fp32) +GrB_Info GB (_uop_tran__identity_fc64_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3221,7 +3221,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fp32) ) ; -GrB_Info GB (_unop_apply__identity_fc64_fp64) +GrB_Info GB (_uop_apply__identity_fc64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -3230,7 +3230,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_fp64) +GrB_Info GB (_uop_tran__identity_fc64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3241,7 +3241,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fp64) ) ; -GrB_Info GB (_unop_apply__identity_fc64_fc32) +GrB_Info GB (_uop_apply__identity_fc64_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -3250,7 +3250,7 @@ GrB_Info GB (_unop_apply__identity_fc64_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__identity_fc64_fc32) +GrB_Info GB (_uop_tran__identity_fc64_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3261,7 +3261,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fc32) ) ; -GrB_Info GB (_unop_tran__identity_fc64_fc64) +GrB_Info GB (_uop_tran__identity_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3272,7 +3272,7 @@ GrB_Info GB (_unop_tran__identity_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__ainv_bool_bool) +GrB_Info GB (_uop_apply__ainv_bool_bool) ( GB_void *Cx, const GB_void *Ax, @@ -3281,7 +3281,7 @@ GrB_Info GB (_unop_apply__ainv_bool_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_bool_bool) +GrB_Info GB (_uop_tran__ainv_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -3292,7 +3292,7 @@ GrB_Info GB (_unop_tran__ainv_bool_bool) ) ; -GrB_Info GB (_unop_apply__ainv_int8_int8) +GrB_Info GB (_uop_apply__ainv_int8_int8) ( GB_void *Cx, const GB_void *Ax, @@ -3301,7 +3301,7 @@ GrB_Info GB (_unop_apply__ainv_int8_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_int8_int8) +GrB_Info GB (_uop_tran__ainv_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3312,7 +3312,7 @@ GrB_Info GB (_unop_tran__ainv_int8_int8) ) ; -GrB_Info GB (_unop_apply__ainv_int16_int16) +GrB_Info GB (_uop_apply__ainv_int16_int16) ( GB_void *Cx, const GB_void *Ax, @@ -3321,7 +3321,7 @@ GrB_Info GB (_unop_apply__ainv_int16_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_int16_int16) +GrB_Info GB (_uop_tran__ainv_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3332,7 +3332,7 @@ GrB_Info GB (_unop_tran__ainv_int16_int16) ) ; -GrB_Info GB (_unop_apply__ainv_int32_int32) +GrB_Info GB (_uop_apply__ainv_int32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -3341,7 +3341,7 @@ GrB_Info GB (_unop_apply__ainv_int32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_int32_int32) +GrB_Info GB (_uop_tran__ainv_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3352,7 +3352,7 @@ GrB_Info GB (_unop_tran__ainv_int32_int32) ) ; -GrB_Info GB (_unop_apply__ainv_int64_int64) +GrB_Info GB (_uop_apply__ainv_int64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -3361,7 +3361,7 @@ GrB_Info GB (_unop_apply__ainv_int64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_int64_int64) +GrB_Info GB (_uop_tran__ainv_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3372,7 +3372,7 @@ GrB_Info GB (_unop_tran__ainv_int64_int64) ) ; -GrB_Info GB (_unop_apply__ainv_uint8_uint8) +GrB_Info GB (_uop_apply__ainv_uint8_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -3381,7 +3381,7 @@ GrB_Info GB (_unop_apply__ainv_uint8_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_uint8_uint8) +GrB_Info GB (_uop_tran__ainv_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3392,7 +3392,7 @@ GrB_Info GB (_unop_tran__ainv_uint8_uint8) ) ; -GrB_Info GB (_unop_apply__ainv_uint16_uint16) +GrB_Info GB (_uop_apply__ainv_uint16_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -3401,7 +3401,7 @@ GrB_Info GB (_unop_apply__ainv_uint16_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_uint16_uint16) +GrB_Info GB (_uop_tran__ainv_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3412,7 +3412,7 @@ GrB_Info GB (_unop_tran__ainv_uint16_uint16) ) ; -GrB_Info GB (_unop_apply__ainv_uint32_uint32) +GrB_Info GB (_uop_apply__ainv_uint32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -3421,7 +3421,7 @@ GrB_Info GB (_unop_apply__ainv_uint32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_uint32_uint32) +GrB_Info GB (_uop_tran__ainv_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3432,7 +3432,7 @@ GrB_Info GB (_unop_tran__ainv_uint32_uint32) ) ; -GrB_Info GB (_unop_apply__ainv_uint64_uint64) +GrB_Info GB (_uop_apply__ainv_uint64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -3441,7 +3441,7 @@ GrB_Info GB (_unop_apply__ainv_uint64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_uint64_uint64) +GrB_Info GB (_uop_tran__ainv_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3452,7 +3452,7 @@ GrB_Info GB (_unop_tran__ainv_uint64_uint64) ) ; -GrB_Info GB (_unop_apply__ainv_fp32_fp32) +GrB_Info GB (_uop_apply__ainv_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -3461,7 +3461,7 @@ GrB_Info GB (_unop_apply__ainv_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_fp32_fp32) +GrB_Info GB (_uop_tran__ainv_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3472,7 +3472,7 @@ GrB_Info GB (_unop_tran__ainv_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__ainv_fp64_fp64) +GrB_Info GB (_uop_apply__ainv_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -3481,7 +3481,7 @@ GrB_Info GB (_unop_apply__ainv_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_fp64_fp64) +GrB_Info GB (_uop_tran__ainv_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3492,7 +3492,7 @@ GrB_Info GB (_unop_tran__ainv_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__ainv_fc32_fc32) +GrB_Info GB (_uop_apply__ainv_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -3501,7 +3501,7 @@ GrB_Info GB (_unop_apply__ainv_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_fc32_fc32) +GrB_Info GB (_uop_tran__ainv_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3512,7 +3512,7 @@ GrB_Info GB (_unop_tran__ainv_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__ainv_fc64_fc64) +GrB_Info GB (_uop_apply__ainv_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -3521,7 +3521,7 @@ GrB_Info GB (_unop_apply__ainv_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__ainv_fc64_fc64) +GrB_Info GB (_uop_tran__ainv_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3532,7 +3532,7 @@ GrB_Info GB (_unop_tran__ainv_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__abs_bool_bool) +GrB_Info GB (_uop_apply__abs_bool_bool) ( GB_void *Cx, const GB_void *Ax, @@ -3541,7 +3541,7 @@ GrB_Info GB (_unop_apply__abs_bool_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_bool_bool) +GrB_Info GB (_uop_tran__abs_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -3552,7 +3552,7 @@ GrB_Info GB (_unop_tran__abs_bool_bool) ) ; -GrB_Info GB (_unop_apply__abs_int8_int8) +GrB_Info GB (_uop_apply__abs_int8_int8) ( GB_void *Cx, const GB_void *Ax, @@ -3561,7 +3561,7 @@ GrB_Info GB (_unop_apply__abs_int8_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_int8_int8) +GrB_Info GB (_uop_tran__abs_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3572,7 +3572,7 @@ GrB_Info GB (_unop_tran__abs_int8_int8) ) ; -GrB_Info GB (_unop_apply__abs_int16_int16) +GrB_Info GB (_uop_apply__abs_int16_int16) ( GB_void *Cx, const GB_void *Ax, @@ -3581,7 +3581,7 @@ GrB_Info GB (_unop_apply__abs_int16_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_int16_int16) +GrB_Info GB (_uop_tran__abs_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3592,7 +3592,7 @@ GrB_Info GB (_unop_tran__abs_int16_int16) ) ; -GrB_Info GB (_unop_apply__abs_int32_int32) +GrB_Info GB (_uop_apply__abs_int32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -3601,7 +3601,7 @@ GrB_Info GB (_unop_apply__abs_int32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_int32_int32) +GrB_Info GB (_uop_tran__abs_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3612,7 +3612,7 @@ GrB_Info GB (_unop_tran__abs_int32_int32) ) ; -GrB_Info GB (_unop_apply__abs_int64_int64) +GrB_Info GB (_uop_apply__abs_int64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -3621,7 +3621,7 @@ GrB_Info GB (_unop_apply__abs_int64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_int64_int64) +GrB_Info GB (_uop_tran__abs_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3632,7 +3632,7 @@ GrB_Info GB (_unop_tran__abs_int64_int64) ) ; -GrB_Info GB (_unop_apply__abs_uint8_uint8) +GrB_Info GB (_uop_apply__abs_uint8_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -3641,7 +3641,7 @@ GrB_Info GB (_unop_apply__abs_uint8_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_uint8_uint8) +GrB_Info GB (_uop_tran__abs_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3652,7 +3652,7 @@ GrB_Info GB (_unop_tran__abs_uint8_uint8) ) ; -GrB_Info GB (_unop_apply__abs_uint16_uint16) +GrB_Info GB (_uop_apply__abs_uint16_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -3661,7 +3661,7 @@ GrB_Info GB (_unop_apply__abs_uint16_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_uint16_uint16) +GrB_Info GB (_uop_tran__abs_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3672,7 +3672,7 @@ GrB_Info GB (_unop_tran__abs_uint16_uint16) ) ; -GrB_Info GB (_unop_apply__abs_uint32_uint32) +GrB_Info GB (_uop_apply__abs_uint32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -3681,7 +3681,7 @@ GrB_Info GB (_unop_apply__abs_uint32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_uint32_uint32) +GrB_Info GB (_uop_tran__abs_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3692,7 +3692,7 @@ GrB_Info GB (_unop_tran__abs_uint32_uint32) ) ; -GrB_Info GB (_unop_apply__abs_uint64_uint64) +GrB_Info GB (_uop_apply__abs_uint64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -3701,7 +3701,7 @@ GrB_Info GB (_unop_apply__abs_uint64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_uint64_uint64) +GrB_Info GB (_uop_tran__abs_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3712,7 +3712,7 @@ GrB_Info GB (_unop_tran__abs_uint64_uint64) ) ; -GrB_Info GB (_unop_apply__abs_fp32_fp32) +GrB_Info GB (_uop_apply__abs_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -3721,7 +3721,7 @@ GrB_Info GB (_unop_apply__abs_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_fp32_fp32) +GrB_Info GB (_uop_tran__abs_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3732,7 +3732,7 @@ GrB_Info GB (_unop_tran__abs_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__abs_fp64_fp64) +GrB_Info GB (_uop_apply__abs_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -3741,7 +3741,7 @@ GrB_Info GB (_unop_apply__abs_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_fp64_fp64) +GrB_Info GB (_uop_tran__abs_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3752,7 +3752,7 @@ GrB_Info GB (_unop_tran__abs_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__minv_bool_bool) +GrB_Info GB (_uop_apply__minv_bool_bool) ( GB_void *Cx, const GB_void *Ax, @@ -3761,7 +3761,7 @@ GrB_Info GB (_unop_apply__minv_bool_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_bool_bool) +GrB_Info GB (_uop_tran__minv_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -3772,7 +3772,7 @@ GrB_Info GB (_unop_tran__minv_bool_bool) ) ; -GrB_Info GB (_unop_apply__minv_int8_int8) +GrB_Info GB (_uop_apply__minv_int8_int8) ( GB_void *Cx, const GB_void *Ax, @@ -3781,7 +3781,7 @@ GrB_Info GB (_unop_apply__minv_int8_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_int8_int8) +GrB_Info GB (_uop_tran__minv_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3792,7 +3792,7 @@ GrB_Info GB (_unop_tran__minv_int8_int8) ) ; -GrB_Info GB (_unop_apply__minv_int16_int16) +GrB_Info GB (_uop_apply__minv_int16_int16) ( GB_void *Cx, const GB_void *Ax, @@ -3801,7 +3801,7 @@ GrB_Info GB (_unop_apply__minv_int16_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_int16_int16) +GrB_Info GB (_uop_tran__minv_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3812,7 +3812,7 @@ GrB_Info GB (_unop_tran__minv_int16_int16) ) ; -GrB_Info GB (_unop_apply__minv_int32_int32) +GrB_Info GB (_uop_apply__minv_int32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -3821,7 +3821,7 @@ GrB_Info GB (_unop_apply__minv_int32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_int32_int32) +GrB_Info GB (_uop_tran__minv_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3832,7 +3832,7 @@ GrB_Info GB (_unop_tran__minv_int32_int32) ) ; -GrB_Info GB (_unop_apply__minv_int64_int64) +GrB_Info GB (_uop_apply__minv_int64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -3841,7 +3841,7 @@ GrB_Info GB (_unop_apply__minv_int64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_int64_int64) +GrB_Info GB (_uop_tran__minv_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3852,7 +3852,7 @@ GrB_Info GB (_unop_tran__minv_int64_int64) ) ; -GrB_Info GB (_unop_apply__minv_uint8_uint8) +GrB_Info GB (_uop_apply__minv_uint8_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -3861,7 +3861,7 @@ GrB_Info GB (_unop_apply__minv_uint8_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_uint8_uint8) +GrB_Info GB (_uop_tran__minv_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -3872,7 +3872,7 @@ GrB_Info GB (_unop_tran__minv_uint8_uint8) ) ; -GrB_Info GB (_unop_apply__minv_uint16_uint16) +GrB_Info GB (_uop_apply__minv_uint16_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -3881,7 +3881,7 @@ GrB_Info GB (_unop_apply__minv_uint16_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_uint16_uint16) +GrB_Info GB (_uop_tran__minv_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -3892,7 +3892,7 @@ GrB_Info GB (_unop_tran__minv_uint16_uint16) ) ; -GrB_Info GB (_unop_apply__minv_uint32_uint32) +GrB_Info GB (_uop_apply__minv_uint32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -3901,7 +3901,7 @@ GrB_Info GB (_unop_apply__minv_uint32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_uint32_uint32) +GrB_Info GB (_uop_tran__minv_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3912,7 +3912,7 @@ GrB_Info GB (_unop_tran__minv_uint32_uint32) ) ; -GrB_Info GB (_unop_apply__minv_uint64_uint64) +GrB_Info GB (_uop_apply__minv_uint64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -3921,7 +3921,7 @@ GrB_Info GB (_unop_apply__minv_uint64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_uint64_uint64) +GrB_Info GB (_uop_tran__minv_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3932,7 +3932,7 @@ GrB_Info GB (_unop_tran__minv_uint64_uint64) ) ; -GrB_Info GB (_unop_apply__minv_fp32_fp32) +GrB_Info GB (_uop_apply__minv_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -3941,7 +3941,7 @@ GrB_Info GB (_unop_apply__minv_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_fp32_fp32) +GrB_Info GB (_uop_tran__minv_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3952,7 +3952,7 @@ GrB_Info GB (_unop_tran__minv_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__minv_fp64_fp64) +GrB_Info GB (_uop_apply__minv_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -3961,7 +3961,7 @@ GrB_Info GB (_unop_apply__minv_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_fp64_fp64) +GrB_Info GB (_uop_tran__minv_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -3972,7 +3972,7 @@ GrB_Info GB (_unop_tran__minv_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__minv_fc32_fc32) +GrB_Info GB (_uop_apply__minv_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -3981,7 +3981,7 @@ GrB_Info GB (_unop_apply__minv_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_fc32_fc32) +GrB_Info GB (_uop_tran__minv_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -3992,7 +3992,7 @@ GrB_Info GB (_unop_tran__minv_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__minv_fc64_fc64) +GrB_Info GB (_uop_apply__minv_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4001,7 +4001,7 @@ GrB_Info GB (_unop_apply__minv_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__minv_fc64_fc64) +GrB_Info GB (_uop_tran__minv_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4012,7 +4012,7 @@ GrB_Info GB (_unop_tran__minv_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__lnot_bool_bool) +GrB_Info GB (_uop_apply__lnot_bool_bool) ( GB_void *Cx, const GB_void *Ax, @@ -4021,7 +4021,7 @@ GrB_Info GB (_unop_apply__lnot_bool_bool) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_bool_bool) +GrB_Info GB (_uop_tran__lnot_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -4032,7 +4032,7 @@ GrB_Info GB (_unop_tran__lnot_bool_bool) ) ; -GrB_Info GB (_unop_apply__lnot_int8_int8) +GrB_Info GB (_uop_apply__lnot_int8_int8) ( GB_void *Cx, const GB_void *Ax, @@ -4041,7 +4041,7 @@ GrB_Info GB (_unop_apply__lnot_int8_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_int8_int8) +GrB_Info GB (_uop_tran__lnot_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -4052,7 +4052,7 @@ GrB_Info GB (_unop_tran__lnot_int8_int8) ) ; -GrB_Info GB (_unop_apply__lnot_int16_int16) +GrB_Info GB (_uop_apply__lnot_int16_int16) ( GB_void *Cx, const GB_void *Ax, @@ -4061,7 +4061,7 @@ GrB_Info GB (_unop_apply__lnot_int16_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_int16_int16) +GrB_Info GB (_uop_tran__lnot_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -4072,7 +4072,7 @@ GrB_Info GB (_unop_tran__lnot_int16_int16) ) ; -GrB_Info GB (_unop_apply__lnot_int32_int32) +GrB_Info GB (_uop_apply__lnot_int32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -4081,7 +4081,7 @@ GrB_Info GB (_unop_apply__lnot_int32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_int32_int32) +GrB_Info GB (_uop_tran__lnot_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4092,7 +4092,7 @@ GrB_Info GB (_unop_tran__lnot_int32_int32) ) ; -GrB_Info GB (_unop_apply__lnot_int64_int64) +GrB_Info GB (_uop_apply__lnot_int64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -4101,7 +4101,7 @@ GrB_Info GB (_unop_apply__lnot_int64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_int64_int64) +GrB_Info GB (_uop_tran__lnot_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4112,7 +4112,7 @@ GrB_Info GB (_unop_tran__lnot_int64_int64) ) ; -GrB_Info GB (_unop_apply__lnot_uint8_uint8) +GrB_Info GB (_uop_apply__lnot_uint8_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -4121,7 +4121,7 @@ GrB_Info GB (_unop_apply__lnot_uint8_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_uint8_uint8) +GrB_Info GB (_uop_tran__lnot_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -4132,7 +4132,7 @@ GrB_Info GB (_unop_tran__lnot_uint8_uint8) ) ; -GrB_Info GB (_unop_apply__lnot_uint16_uint16) +GrB_Info GB (_uop_apply__lnot_uint16_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -4141,7 +4141,7 @@ GrB_Info GB (_unop_apply__lnot_uint16_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_uint16_uint16) +GrB_Info GB (_uop_tran__lnot_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -4152,7 +4152,7 @@ GrB_Info GB (_unop_tran__lnot_uint16_uint16) ) ; -GrB_Info GB (_unop_apply__lnot_uint32_uint32) +GrB_Info GB (_uop_apply__lnot_uint32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -4161,7 +4161,7 @@ GrB_Info GB (_unop_apply__lnot_uint32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_uint32_uint32) +GrB_Info GB (_uop_tran__lnot_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4172,7 +4172,7 @@ GrB_Info GB (_unop_tran__lnot_uint32_uint32) ) ; -GrB_Info GB (_unop_apply__lnot_uint64_uint64) +GrB_Info GB (_uop_apply__lnot_uint64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -4181,7 +4181,7 @@ GrB_Info GB (_unop_apply__lnot_uint64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_uint64_uint64) +GrB_Info GB (_uop_tran__lnot_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4192,7 +4192,7 @@ GrB_Info GB (_unop_tran__lnot_uint64_uint64) ) ; -GrB_Info GB (_unop_apply__lnot_fp32_fp32) +GrB_Info GB (_uop_apply__lnot_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4201,7 +4201,7 @@ GrB_Info GB (_unop_apply__lnot_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_fp32_fp32) +GrB_Info GB (_uop_tran__lnot_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4212,7 +4212,7 @@ GrB_Info GB (_unop_tran__lnot_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__lnot_fp64_fp64) +GrB_Info GB (_uop_apply__lnot_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4221,7 +4221,7 @@ GrB_Info GB (_unop_apply__lnot_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__lnot_fp64_fp64) +GrB_Info GB (_uop_tran__lnot_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4232,7 +4232,7 @@ GrB_Info GB (_unop_tran__lnot_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__bnot_int8_int8) +GrB_Info GB (_uop_apply__bnot_int8_int8) ( GB_void *Cx, const GB_void *Ax, @@ -4241,7 +4241,7 @@ GrB_Info GB (_unop_apply__bnot_int8_int8) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_int8_int8) +GrB_Info GB (_uop_tran__bnot_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -4252,7 +4252,7 @@ GrB_Info GB (_unop_tran__bnot_int8_int8) ) ; -GrB_Info GB (_unop_apply__bnot_int16_int16) +GrB_Info GB (_uop_apply__bnot_int16_int16) ( GB_void *Cx, const GB_void *Ax, @@ -4261,7 +4261,7 @@ GrB_Info GB (_unop_apply__bnot_int16_int16) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_int16_int16) +GrB_Info GB (_uop_tran__bnot_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -4272,7 +4272,7 @@ GrB_Info GB (_unop_tran__bnot_int16_int16) ) ; -GrB_Info GB (_unop_apply__bnot_int32_int32) +GrB_Info GB (_uop_apply__bnot_int32_int32) ( GB_void *Cx, const GB_void *Ax, @@ -4281,7 +4281,7 @@ GrB_Info GB (_unop_apply__bnot_int32_int32) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_int32_int32) +GrB_Info GB (_uop_tran__bnot_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4292,7 +4292,7 @@ GrB_Info GB (_unop_tran__bnot_int32_int32) ) ; -GrB_Info GB (_unop_apply__bnot_int64_int64) +GrB_Info GB (_uop_apply__bnot_int64_int64) ( GB_void *Cx, const GB_void *Ax, @@ -4301,7 +4301,7 @@ GrB_Info GB (_unop_apply__bnot_int64_int64) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_int64_int64) +GrB_Info GB (_uop_tran__bnot_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4312,7 +4312,7 @@ GrB_Info GB (_unop_tran__bnot_int64_int64) ) ; -GrB_Info GB (_unop_apply__bnot_uint8_uint8) +GrB_Info GB (_uop_apply__bnot_uint8_uint8) ( GB_void *Cx, const GB_void *Ax, @@ -4321,7 +4321,7 @@ GrB_Info GB (_unop_apply__bnot_uint8_uint8) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_uint8_uint8) +GrB_Info GB (_uop_tran__bnot_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -4332,7 +4332,7 @@ GrB_Info GB (_unop_tran__bnot_uint8_uint8) ) ; -GrB_Info GB (_unop_apply__bnot_uint16_uint16) +GrB_Info GB (_uop_apply__bnot_uint16_uint16) ( GB_void *Cx, const GB_void *Ax, @@ -4341,7 +4341,7 @@ GrB_Info GB (_unop_apply__bnot_uint16_uint16) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_uint16_uint16) +GrB_Info GB (_uop_tran__bnot_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -4352,7 +4352,7 @@ GrB_Info GB (_unop_tran__bnot_uint16_uint16) ) ; -GrB_Info GB (_unop_apply__bnot_uint32_uint32) +GrB_Info GB (_uop_apply__bnot_uint32_uint32) ( GB_void *Cx, const GB_void *Ax, @@ -4361,7 +4361,7 @@ GrB_Info GB (_unop_apply__bnot_uint32_uint32) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_uint32_uint32) +GrB_Info GB (_uop_tran__bnot_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4372,7 +4372,7 @@ GrB_Info GB (_unop_tran__bnot_uint32_uint32) ) ; -GrB_Info GB (_unop_apply__bnot_uint64_uint64) +GrB_Info GB (_uop_apply__bnot_uint64_uint64) ( GB_void *Cx, const GB_void *Ax, @@ -4381,7 +4381,7 @@ GrB_Info GB (_unop_apply__bnot_uint64_uint64) int nthreads ) ; -GrB_Info GB (_unop_tran__bnot_uint64_uint64) +GrB_Info GB (_uop_tran__bnot_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4392,7 +4392,7 @@ GrB_Info GB (_unop_tran__bnot_uint64_uint64) ) ; -GrB_Info GB (_unop_apply__sqrt_fp32_fp32) +GrB_Info GB (_uop_apply__sqrt_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4401,7 +4401,7 @@ GrB_Info GB (_unop_apply__sqrt_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__sqrt_fp32_fp32) +GrB_Info GB (_uop_tran__sqrt_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4412,7 +4412,7 @@ GrB_Info GB (_unop_tran__sqrt_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__sqrt_fp64_fp64) +GrB_Info GB (_uop_apply__sqrt_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4421,7 +4421,7 @@ GrB_Info GB (_unop_apply__sqrt_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__sqrt_fp64_fp64) +GrB_Info GB (_uop_tran__sqrt_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4432,7 +4432,7 @@ GrB_Info GB (_unop_tran__sqrt_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__sqrt_fc32_fc32) +GrB_Info GB (_uop_apply__sqrt_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4441,7 +4441,7 @@ GrB_Info GB (_unop_apply__sqrt_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__sqrt_fc32_fc32) +GrB_Info GB (_uop_tran__sqrt_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4452,7 +4452,7 @@ GrB_Info GB (_unop_tran__sqrt_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__sqrt_fc64_fc64) +GrB_Info GB (_uop_apply__sqrt_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4461,7 +4461,7 @@ GrB_Info GB (_unop_apply__sqrt_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__sqrt_fc64_fc64) +GrB_Info GB (_uop_tran__sqrt_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4472,7 +4472,7 @@ GrB_Info GB (_unop_tran__sqrt_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__log_fp32_fp32) +GrB_Info GB (_uop_apply__log_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4481,7 +4481,7 @@ GrB_Info GB (_unop_apply__log_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__log_fp32_fp32) +GrB_Info GB (_uop_tran__log_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4492,7 +4492,7 @@ GrB_Info GB (_unop_tran__log_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__log_fp64_fp64) +GrB_Info GB (_uop_apply__log_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4501,7 +4501,7 @@ GrB_Info GB (_unop_apply__log_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__log_fp64_fp64) +GrB_Info GB (_uop_tran__log_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4512,7 +4512,7 @@ GrB_Info GB (_unop_tran__log_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__log_fc32_fc32) +GrB_Info GB (_uop_apply__log_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4521,7 +4521,7 @@ GrB_Info GB (_unop_apply__log_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__log_fc32_fc32) +GrB_Info GB (_uop_tran__log_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4532,7 +4532,7 @@ GrB_Info GB (_unop_tran__log_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__log_fc64_fc64) +GrB_Info GB (_uop_apply__log_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4541,7 +4541,7 @@ GrB_Info GB (_unop_apply__log_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__log_fc64_fc64) +GrB_Info GB (_uop_tran__log_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4552,7 +4552,7 @@ GrB_Info GB (_unop_tran__log_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__exp_fp32_fp32) +GrB_Info GB (_uop_apply__exp_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4561,7 +4561,7 @@ GrB_Info GB (_unop_apply__exp_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__exp_fp32_fp32) +GrB_Info GB (_uop_tran__exp_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4572,7 +4572,7 @@ GrB_Info GB (_unop_tran__exp_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__exp_fp64_fp64) +GrB_Info GB (_uop_apply__exp_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4581,7 +4581,7 @@ GrB_Info GB (_unop_apply__exp_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__exp_fp64_fp64) +GrB_Info GB (_uop_tran__exp_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4592,7 +4592,7 @@ GrB_Info GB (_unop_tran__exp_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__exp_fc32_fc32) +GrB_Info GB (_uop_apply__exp_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4601,7 +4601,7 @@ GrB_Info GB (_unop_apply__exp_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__exp_fc32_fc32) +GrB_Info GB (_uop_tran__exp_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4612,7 +4612,7 @@ GrB_Info GB (_unop_tran__exp_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__exp_fc64_fc64) +GrB_Info GB (_uop_apply__exp_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4621,7 +4621,7 @@ GrB_Info GB (_unop_apply__exp_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__exp_fc64_fc64) +GrB_Info GB (_uop_tran__exp_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4632,7 +4632,7 @@ GrB_Info GB (_unop_tran__exp_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__sin_fp32_fp32) +GrB_Info GB (_uop_apply__sin_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4641,7 +4641,7 @@ GrB_Info GB (_unop_apply__sin_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__sin_fp32_fp32) +GrB_Info GB (_uop_tran__sin_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4652,7 +4652,7 @@ GrB_Info GB (_unop_tran__sin_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__sin_fp64_fp64) +GrB_Info GB (_uop_apply__sin_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4661,7 +4661,7 @@ GrB_Info GB (_unop_apply__sin_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__sin_fp64_fp64) +GrB_Info GB (_uop_tran__sin_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4672,7 +4672,7 @@ GrB_Info GB (_unop_tran__sin_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__sin_fc32_fc32) +GrB_Info GB (_uop_apply__sin_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4681,7 +4681,7 @@ GrB_Info GB (_unop_apply__sin_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__sin_fc32_fc32) +GrB_Info GB (_uop_tran__sin_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4692,7 +4692,7 @@ GrB_Info GB (_unop_tran__sin_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__sin_fc64_fc64) +GrB_Info GB (_uop_apply__sin_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4701,7 +4701,7 @@ GrB_Info GB (_unop_apply__sin_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__sin_fc64_fc64) +GrB_Info GB (_uop_tran__sin_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4712,7 +4712,7 @@ GrB_Info GB (_unop_tran__sin_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__cos_fp32_fp32) +GrB_Info GB (_uop_apply__cos_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4721,7 +4721,7 @@ GrB_Info GB (_unop_apply__cos_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__cos_fp32_fp32) +GrB_Info GB (_uop_tran__cos_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4732,7 +4732,7 @@ GrB_Info GB (_unop_tran__cos_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__cos_fp64_fp64) +GrB_Info GB (_uop_apply__cos_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4741,7 +4741,7 @@ GrB_Info GB (_unop_apply__cos_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__cos_fp64_fp64) +GrB_Info GB (_uop_tran__cos_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4752,7 +4752,7 @@ GrB_Info GB (_unop_tran__cos_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__cos_fc32_fc32) +GrB_Info GB (_uop_apply__cos_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4761,7 +4761,7 @@ GrB_Info GB (_unop_apply__cos_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__cos_fc32_fc32) +GrB_Info GB (_uop_tran__cos_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4772,7 +4772,7 @@ GrB_Info GB (_unop_tran__cos_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__cos_fc64_fc64) +GrB_Info GB (_uop_apply__cos_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4781,7 +4781,7 @@ GrB_Info GB (_unop_apply__cos_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__cos_fc64_fc64) +GrB_Info GB (_uop_tran__cos_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4792,7 +4792,7 @@ GrB_Info GB (_unop_tran__cos_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__tan_fp32_fp32) +GrB_Info GB (_uop_apply__tan_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4801,7 +4801,7 @@ GrB_Info GB (_unop_apply__tan_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__tan_fp32_fp32) +GrB_Info GB (_uop_tran__tan_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4812,7 +4812,7 @@ GrB_Info GB (_unop_tran__tan_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__tan_fp64_fp64) +GrB_Info GB (_uop_apply__tan_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4821,7 +4821,7 @@ GrB_Info GB (_unop_apply__tan_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__tan_fp64_fp64) +GrB_Info GB (_uop_tran__tan_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4832,7 +4832,7 @@ GrB_Info GB (_unop_tran__tan_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__tan_fc32_fc32) +GrB_Info GB (_uop_apply__tan_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4841,7 +4841,7 @@ GrB_Info GB (_unop_apply__tan_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__tan_fc32_fc32) +GrB_Info GB (_uop_tran__tan_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4852,7 +4852,7 @@ GrB_Info GB (_unop_tran__tan_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__tan_fc64_fc64) +GrB_Info GB (_uop_apply__tan_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4861,7 +4861,7 @@ GrB_Info GB (_unop_apply__tan_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__tan_fc64_fc64) +GrB_Info GB (_uop_tran__tan_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4872,7 +4872,7 @@ GrB_Info GB (_unop_tran__tan_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__asin_fp32_fp32) +GrB_Info GB (_uop_apply__asin_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4881,7 +4881,7 @@ GrB_Info GB (_unop_apply__asin_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__asin_fp32_fp32) +GrB_Info GB (_uop_tran__asin_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4892,7 +4892,7 @@ GrB_Info GB (_unop_tran__asin_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__asin_fp64_fp64) +GrB_Info GB (_uop_apply__asin_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4901,7 +4901,7 @@ GrB_Info GB (_unop_apply__asin_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__asin_fp64_fp64) +GrB_Info GB (_uop_tran__asin_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4912,7 +4912,7 @@ GrB_Info GB (_unop_tran__asin_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__asin_fc32_fc32) +GrB_Info GB (_uop_apply__asin_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -4921,7 +4921,7 @@ GrB_Info GB (_unop_apply__asin_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__asin_fc32_fc32) +GrB_Info GB (_uop_tran__asin_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4932,7 +4932,7 @@ GrB_Info GB (_unop_tran__asin_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__asin_fc64_fc64) +GrB_Info GB (_uop_apply__asin_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -4941,7 +4941,7 @@ GrB_Info GB (_unop_apply__asin_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__asin_fc64_fc64) +GrB_Info GB (_uop_tran__asin_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4952,7 +4952,7 @@ GrB_Info GB (_unop_tran__asin_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__acos_fp32_fp32) +GrB_Info GB (_uop_apply__acos_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -4961,7 +4961,7 @@ GrB_Info GB (_unop_apply__acos_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__acos_fp32_fp32) +GrB_Info GB (_uop_tran__acos_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -4972,7 +4972,7 @@ GrB_Info GB (_unop_tran__acos_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__acos_fp64_fp64) +GrB_Info GB (_uop_apply__acos_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -4981,7 +4981,7 @@ GrB_Info GB (_unop_apply__acos_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__acos_fp64_fp64) +GrB_Info GB (_uop_tran__acos_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -4992,7 +4992,7 @@ GrB_Info GB (_unop_tran__acos_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__acos_fc32_fc32) +GrB_Info GB (_uop_apply__acos_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5001,7 +5001,7 @@ GrB_Info GB (_unop_apply__acos_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__acos_fc32_fc32) +GrB_Info GB (_uop_tran__acos_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5012,7 +5012,7 @@ GrB_Info GB (_unop_tran__acos_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__acos_fc64_fc64) +GrB_Info GB (_uop_apply__acos_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5021,7 +5021,7 @@ GrB_Info GB (_unop_apply__acos_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__acos_fc64_fc64) +GrB_Info GB (_uop_tran__acos_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5032,7 +5032,7 @@ GrB_Info GB (_unop_tran__acos_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__atan_fp32_fp32) +GrB_Info GB (_uop_apply__atan_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5041,7 +5041,7 @@ GrB_Info GB (_unop_apply__atan_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__atan_fp32_fp32) +GrB_Info GB (_uop_tran__atan_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5052,7 +5052,7 @@ GrB_Info GB (_unop_tran__atan_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__atan_fp64_fp64) +GrB_Info GB (_uop_apply__atan_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5061,7 +5061,7 @@ GrB_Info GB (_unop_apply__atan_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__atan_fp64_fp64) +GrB_Info GB (_uop_tran__atan_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5072,7 +5072,7 @@ GrB_Info GB (_unop_tran__atan_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__atan_fc32_fc32) +GrB_Info GB (_uop_apply__atan_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5081,7 +5081,7 @@ GrB_Info GB (_unop_apply__atan_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__atan_fc32_fc32) +GrB_Info GB (_uop_tran__atan_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5092,7 +5092,7 @@ GrB_Info GB (_unop_tran__atan_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__atan_fc64_fc64) +GrB_Info GB (_uop_apply__atan_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5101,7 +5101,7 @@ GrB_Info GB (_unop_apply__atan_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__atan_fc64_fc64) +GrB_Info GB (_uop_tran__atan_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5112,7 +5112,7 @@ GrB_Info GB (_unop_tran__atan_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__sinh_fp32_fp32) +GrB_Info GB (_uop_apply__sinh_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5121,7 +5121,7 @@ GrB_Info GB (_unop_apply__sinh_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__sinh_fp32_fp32) +GrB_Info GB (_uop_tran__sinh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5132,7 +5132,7 @@ GrB_Info GB (_unop_tran__sinh_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__sinh_fp64_fp64) +GrB_Info GB (_uop_apply__sinh_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5141,7 +5141,7 @@ GrB_Info GB (_unop_apply__sinh_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__sinh_fp64_fp64) +GrB_Info GB (_uop_tran__sinh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5152,7 +5152,7 @@ GrB_Info GB (_unop_tran__sinh_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__sinh_fc32_fc32) +GrB_Info GB (_uop_apply__sinh_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5161,7 +5161,7 @@ GrB_Info GB (_unop_apply__sinh_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__sinh_fc32_fc32) +GrB_Info GB (_uop_tran__sinh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5172,7 +5172,7 @@ GrB_Info GB (_unop_tran__sinh_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__sinh_fc64_fc64) +GrB_Info GB (_uop_apply__sinh_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5181,7 +5181,7 @@ GrB_Info GB (_unop_apply__sinh_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__sinh_fc64_fc64) +GrB_Info GB (_uop_tran__sinh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5192,7 +5192,7 @@ GrB_Info GB (_unop_tran__sinh_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__cosh_fp32_fp32) +GrB_Info GB (_uop_apply__cosh_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5201,7 +5201,7 @@ GrB_Info GB (_unop_apply__cosh_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__cosh_fp32_fp32) +GrB_Info GB (_uop_tran__cosh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5212,7 +5212,7 @@ GrB_Info GB (_unop_tran__cosh_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__cosh_fp64_fp64) +GrB_Info GB (_uop_apply__cosh_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5221,7 +5221,7 @@ GrB_Info GB (_unop_apply__cosh_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__cosh_fp64_fp64) +GrB_Info GB (_uop_tran__cosh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5232,7 +5232,7 @@ GrB_Info GB (_unop_tran__cosh_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__cosh_fc32_fc32) +GrB_Info GB (_uop_apply__cosh_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5241,7 +5241,7 @@ GrB_Info GB (_unop_apply__cosh_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__cosh_fc32_fc32) +GrB_Info GB (_uop_tran__cosh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5252,7 +5252,7 @@ GrB_Info GB (_unop_tran__cosh_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__cosh_fc64_fc64) +GrB_Info GB (_uop_apply__cosh_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5261,7 +5261,7 @@ GrB_Info GB (_unop_apply__cosh_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__cosh_fc64_fc64) +GrB_Info GB (_uop_tran__cosh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5272,7 +5272,7 @@ GrB_Info GB (_unop_tran__cosh_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__tanh_fp32_fp32) +GrB_Info GB (_uop_apply__tanh_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5281,7 +5281,7 @@ GrB_Info GB (_unop_apply__tanh_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__tanh_fp32_fp32) +GrB_Info GB (_uop_tran__tanh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5292,7 +5292,7 @@ GrB_Info GB (_unop_tran__tanh_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__tanh_fp64_fp64) +GrB_Info GB (_uop_apply__tanh_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5301,7 +5301,7 @@ GrB_Info GB (_unop_apply__tanh_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__tanh_fp64_fp64) +GrB_Info GB (_uop_tran__tanh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5312,7 +5312,7 @@ GrB_Info GB (_unop_tran__tanh_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__tanh_fc32_fc32) +GrB_Info GB (_uop_apply__tanh_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5321,7 +5321,7 @@ GrB_Info GB (_unop_apply__tanh_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__tanh_fc32_fc32) +GrB_Info GB (_uop_tran__tanh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5332,7 +5332,7 @@ GrB_Info GB (_unop_tran__tanh_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__tanh_fc64_fc64) +GrB_Info GB (_uop_apply__tanh_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5341,7 +5341,7 @@ GrB_Info GB (_unop_apply__tanh_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__tanh_fc64_fc64) +GrB_Info GB (_uop_tran__tanh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5352,7 +5352,7 @@ GrB_Info GB (_unop_tran__tanh_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__asinh_fp32_fp32) +GrB_Info GB (_uop_apply__asinh_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5361,7 +5361,7 @@ GrB_Info GB (_unop_apply__asinh_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__asinh_fp32_fp32) +GrB_Info GB (_uop_tran__asinh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5372,7 +5372,7 @@ GrB_Info GB (_unop_tran__asinh_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__asinh_fp64_fp64) +GrB_Info GB (_uop_apply__asinh_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5381,7 +5381,7 @@ GrB_Info GB (_unop_apply__asinh_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__asinh_fp64_fp64) +GrB_Info GB (_uop_tran__asinh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5392,7 +5392,7 @@ GrB_Info GB (_unop_tran__asinh_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__asinh_fc32_fc32) +GrB_Info GB (_uop_apply__asinh_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5401,7 +5401,7 @@ GrB_Info GB (_unop_apply__asinh_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__asinh_fc32_fc32) +GrB_Info GB (_uop_tran__asinh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5412,7 +5412,7 @@ GrB_Info GB (_unop_tran__asinh_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__asinh_fc64_fc64) +GrB_Info GB (_uop_apply__asinh_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5421,7 +5421,7 @@ GrB_Info GB (_unop_apply__asinh_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__asinh_fc64_fc64) +GrB_Info GB (_uop_tran__asinh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5432,7 +5432,7 @@ GrB_Info GB (_unop_tran__asinh_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__acosh_fp32_fp32) +GrB_Info GB (_uop_apply__acosh_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5441,7 +5441,7 @@ GrB_Info GB (_unop_apply__acosh_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__acosh_fp32_fp32) +GrB_Info GB (_uop_tran__acosh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5452,7 +5452,7 @@ GrB_Info GB (_unop_tran__acosh_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__acosh_fp64_fp64) +GrB_Info GB (_uop_apply__acosh_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5461,7 +5461,7 @@ GrB_Info GB (_unop_apply__acosh_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__acosh_fp64_fp64) +GrB_Info GB (_uop_tran__acosh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5472,7 +5472,7 @@ GrB_Info GB (_unop_tran__acosh_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__acosh_fc32_fc32) +GrB_Info GB (_uop_apply__acosh_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5481,7 +5481,7 @@ GrB_Info GB (_unop_apply__acosh_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__acosh_fc32_fc32) +GrB_Info GB (_uop_tran__acosh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5492,7 +5492,7 @@ GrB_Info GB (_unop_tran__acosh_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__acosh_fc64_fc64) +GrB_Info GB (_uop_apply__acosh_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5501,7 +5501,7 @@ GrB_Info GB (_unop_apply__acosh_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__acosh_fc64_fc64) +GrB_Info GB (_uop_tran__acosh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5512,7 +5512,7 @@ GrB_Info GB (_unop_tran__acosh_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__atanh_fp32_fp32) +GrB_Info GB (_uop_apply__atanh_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5521,7 +5521,7 @@ GrB_Info GB (_unop_apply__atanh_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__atanh_fp32_fp32) +GrB_Info GB (_uop_tran__atanh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5532,7 +5532,7 @@ GrB_Info GB (_unop_tran__atanh_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__atanh_fp64_fp64) +GrB_Info GB (_uop_apply__atanh_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5541,7 +5541,7 @@ GrB_Info GB (_unop_apply__atanh_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__atanh_fp64_fp64) +GrB_Info GB (_uop_tran__atanh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5552,7 +5552,7 @@ GrB_Info GB (_unop_tran__atanh_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__atanh_fc32_fc32) +GrB_Info GB (_uop_apply__atanh_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5561,7 +5561,7 @@ GrB_Info GB (_unop_apply__atanh_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__atanh_fc32_fc32) +GrB_Info GB (_uop_tran__atanh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5572,7 +5572,7 @@ GrB_Info GB (_unop_tran__atanh_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__atanh_fc64_fc64) +GrB_Info GB (_uop_apply__atanh_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5581,7 +5581,7 @@ GrB_Info GB (_unop_apply__atanh_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__atanh_fc64_fc64) +GrB_Info GB (_uop_tran__atanh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5592,7 +5592,7 @@ GrB_Info GB (_unop_tran__atanh_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__signum_fp32_fp32) +GrB_Info GB (_uop_apply__signum_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5601,7 +5601,7 @@ GrB_Info GB (_unop_apply__signum_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__signum_fp32_fp32) +GrB_Info GB (_uop_tran__signum_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5612,7 +5612,7 @@ GrB_Info GB (_unop_tran__signum_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__signum_fp64_fp64) +GrB_Info GB (_uop_apply__signum_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5621,7 +5621,7 @@ GrB_Info GB (_unop_apply__signum_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__signum_fp64_fp64) +GrB_Info GB (_uop_tran__signum_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5632,7 +5632,7 @@ GrB_Info GB (_unop_tran__signum_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__signum_fc32_fc32) +GrB_Info GB (_uop_apply__signum_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5641,7 +5641,7 @@ GrB_Info GB (_unop_apply__signum_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__signum_fc32_fc32) +GrB_Info GB (_uop_tran__signum_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5652,7 +5652,7 @@ GrB_Info GB (_unop_tran__signum_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__signum_fc64_fc64) +GrB_Info GB (_uop_apply__signum_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5661,7 +5661,7 @@ GrB_Info GB (_unop_apply__signum_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__signum_fc64_fc64) +GrB_Info GB (_uop_tran__signum_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5672,7 +5672,7 @@ GrB_Info GB (_unop_tran__signum_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__ceil_fp32_fp32) +GrB_Info GB (_uop_apply__ceil_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5681,7 +5681,7 @@ GrB_Info GB (_unop_apply__ceil_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__ceil_fp32_fp32) +GrB_Info GB (_uop_tran__ceil_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5692,7 +5692,7 @@ GrB_Info GB (_unop_tran__ceil_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__ceil_fp64_fp64) +GrB_Info GB (_uop_apply__ceil_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5701,7 +5701,7 @@ GrB_Info GB (_unop_apply__ceil_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__ceil_fp64_fp64) +GrB_Info GB (_uop_tran__ceil_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5712,7 +5712,7 @@ GrB_Info GB (_unop_tran__ceil_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__ceil_fc32_fc32) +GrB_Info GB (_uop_apply__ceil_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5721,7 +5721,7 @@ GrB_Info GB (_unop_apply__ceil_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__ceil_fc32_fc32) +GrB_Info GB (_uop_tran__ceil_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5732,7 +5732,7 @@ GrB_Info GB (_unop_tran__ceil_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__ceil_fc64_fc64) +GrB_Info GB (_uop_apply__ceil_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5741,7 +5741,7 @@ GrB_Info GB (_unop_apply__ceil_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__ceil_fc64_fc64) +GrB_Info GB (_uop_tran__ceil_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5752,7 +5752,7 @@ GrB_Info GB (_unop_tran__ceil_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__floor_fp32_fp32) +GrB_Info GB (_uop_apply__floor_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5761,7 +5761,7 @@ GrB_Info GB (_unop_apply__floor_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__floor_fp32_fp32) +GrB_Info GB (_uop_tran__floor_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5772,7 +5772,7 @@ GrB_Info GB (_unop_tran__floor_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__floor_fp64_fp64) +GrB_Info GB (_uop_apply__floor_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5781,7 +5781,7 @@ GrB_Info GB (_unop_apply__floor_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__floor_fp64_fp64) +GrB_Info GB (_uop_tran__floor_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5792,7 +5792,7 @@ GrB_Info GB (_unop_tran__floor_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__floor_fc32_fc32) +GrB_Info GB (_uop_apply__floor_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5801,7 +5801,7 @@ GrB_Info GB (_unop_apply__floor_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__floor_fc32_fc32) +GrB_Info GB (_uop_tran__floor_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5812,7 +5812,7 @@ GrB_Info GB (_unop_tran__floor_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__floor_fc64_fc64) +GrB_Info GB (_uop_apply__floor_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5821,7 +5821,7 @@ GrB_Info GB (_unop_apply__floor_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__floor_fc64_fc64) +GrB_Info GB (_uop_tran__floor_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5832,7 +5832,7 @@ GrB_Info GB (_unop_tran__floor_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__round_fp32_fp32) +GrB_Info GB (_uop_apply__round_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5841,7 +5841,7 @@ GrB_Info GB (_unop_apply__round_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__round_fp32_fp32) +GrB_Info GB (_uop_tran__round_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5852,7 +5852,7 @@ GrB_Info GB (_unop_tran__round_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__round_fp64_fp64) +GrB_Info GB (_uop_apply__round_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5861,7 +5861,7 @@ GrB_Info GB (_unop_apply__round_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__round_fp64_fp64) +GrB_Info GB (_uop_tran__round_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5872,7 +5872,7 @@ GrB_Info GB (_unop_tran__round_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__round_fc32_fc32) +GrB_Info GB (_uop_apply__round_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5881,7 +5881,7 @@ GrB_Info GB (_unop_apply__round_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__round_fc32_fc32) +GrB_Info GB (_uop_tran__round_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5892,7 +5892,7 @@ GrB_Info GB (_unop_tran__round_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__round_fc64_fc64) +GrB_Info GB (_uop_apply__round_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5901,7 +5901,7 @@ GrB_Info GB (_unop_apply__round_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__round_fc64_fc64) +GrB_Info GB (_uop_tran__round_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5912,7 +5912,7 @@ GrB_Info GB (_unop_tran__round_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__trunc_fp32_fp32) +GrB_Info GB (_uop_apply__trunc_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -5921,7 +5921,7 @@ GrB_Info GB (_unop_apply__trunc_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__trunc_fp32_fp32) +GrB_Info GB (_uop_tran__trunc_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5932,7 +5932,7 @@ GrB_Info GB (_unop_tran__trunc_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__trunc_fp64_fp64) +GrB_Info GB (_uop_apply__trunc_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -5941,7 +5941,7 @@ GrB_Info GB (_unop_apply__trunc_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__trunc_fp64_fp64) +GrB_Info GB (_uop_tran__trunc_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5952,7 +5952,7 @@ GrB_Info GB (_unop_tran__trunc_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__trunc_fc32_fc32) +GrB_Info GB (_uop_apply__trunc_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -5961,7 +5961,7 @@ GrB_Info GB (_unop_apply__trunc_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__trunc_fc32_fc32) +GrB_Info GB (_uop_tran__trunc_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -5972,7 +5972,7 @@ GrB_Info GB (_unop_tran__trunc_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__trunc_fc64_fc64) +GrB_Info GB (_uop_apply__trunc_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -5981,7 +5981,7 @@ GrB_Info GB (_unop_apply__trunc_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__trunc_fc64_fc64) +GrB_Info GB (_uop_tran__trunc_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -5992,7 +5992,7 @@ GrB_Info GB (_unop_tran__trunc_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__exp2_fp32_fp32) +GrB_Info GB (_uop_apply__exp2_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6001,7 +6001,7 @@ GrB_Info GB (_unop_apply__exp2_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__exp2_fp32_fp32) +GrB_Info GB (_uop_tran__exp2_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6012,7 +6012,7 @@ GrB_Info GB (_unop_tran__exp2_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__exp2_fp64_fp64) +GrB_Info GB (_uop_apply__exp2_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6021,7 +6021,7 @@ GrB_Info GB (_unop_apply__exp2_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__exp2_fp64_fp64) +GrB_Info GB (_uop_tran__exp2_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6032,7 +6032,7 @@ GrB_Info GB (_unop_tran__exp2_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__exp2_fc32_fc32) +GrB_Info GB (_uop_apply__exp2_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6041,7 +6041,7 @@ GrB_Info GB (_unop_apply__exp2_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__exp2_fc32_fc32) +GrB_Info GB (_uop_tran__exp2_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6052,7 +6052,7 @@ GrB_Info GB (_unop_tran__exp2_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__exp2_fc64_fc64) +GrB_Info GB (_uop_apply__exp2_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6061,7 +6061,7 @@ GrB_Info GB (_unop_apply__exp2_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__exp2_fc64_fc64) +GrB_Info GB (_uop_tran__exp2_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6072,7 +6072,7 @@ GrB_Info GB (_unop_tran__exp2_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__expm1_fp32_fp32) +GrB_Info GB (_uop_apply__expm1_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6081,7 +6081,7 @@ GrB_Info GB (_unop_apply__expm1_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__expm1_fp32_fp32) +GrB_Info GB (_uop_tran__expm1_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6092,7 +6092,7 @@ GrB_Info GB (_unop_tran__expm1_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__expm1_fp64_fp64) +GrB_Info GB (_uop_apply__expm1_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6101,7 +6101,7 @@ GrB_Info GB (_unop_apply__expm1_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__expm1_fp64_fp64) +GrB_Info GB (_uop_tran__expm1_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6112,7 +6112,7 @@ GrB_Info GB (_unop_tran__expm1_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__expm1_fc32_fc32) +GrB_Info GB (_uop_apply__expm1_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6121,7 +6121,7 @@ GrB_Info GB (_unop_apply__expm1_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__expm1_fc32_fc32) +GrB_Info GB (_uop_tran__expm1_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6132,7 +6132,7 @@ GrB_Info GB (_unop_tran__expm1_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__expm1_fc64_fc64) +GrB_Info GB (_uop_apply__expm1_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6141,7 +6141,7 @@ GrB_Info GB (_unop_apply__expm1_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__expm1_fc64_fc64) +GrB_Info GB (_uop_tran__expm1_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6152,7 +6152,7 @@ GrB_Info GB (_unop_tran__expm1_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__log10_fp32_fp32) +GrB_Info GB (_uop_apply__log10_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6161,7 +6161,7 @@ GrB_Info GB (_unop_apply__log10_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__log10_fp32_fp32) +GrB_Info GB (_uop_tran__log10_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6172,7 +6172,7 @@ GrB_Info GB (_unop_tran__log10_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__log10_fp64_fp64) +GrB_Info GB (_uop_apply__log10_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6181,7 +6181,7 @@ GrB_Info GB (_unop_apply__log10_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__log10_fp64_fp64) +GrB_Info GB (_uop_tran__log10_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6192,7 +6192,7 @@ GrB_Info GB (_unop_tran__log10_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__log10_fc32_fc32) +GrB_Info GB (_uop_apply__log10_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6201,7 +6201,7 @@ GrB_Info GB (_unop_apply__log10_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__log10_fc32_fc32) +GrB_Info GB (_uop_tran__log10_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6212,7 +6212,7 @@ GrB_Info GB (_unop_tran__log10_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__log10_fc64_fc64) +GrB_Info GB (_uop_apply__log10_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6221,7 +6221,7 @@ GrB_Info GB (_unop_apply__log10_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__log10_fc64_fc64) +GrB_Info GB (_uop_tran__log10_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6232,7 +6232,7 @@ GrB_Info GB (_unop_tran__log10_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__log1p_fp32_fp32) +GrB_Info GB (_uop_apply__log1p_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6241,7 +6241,7 @@ GrB_Info GB (_unop_apply__log1p_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__log1p_fp32_fp32) +GrB_Info GB (_uop_tran__log1p_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6252,7 +6252,7 @@ GrB_Info GB (_unop_tran__log1p_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__log1p_fp64_fp64) +GrB_Info GB (_uop_apply__log1p_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6261,7 +6261,7 @@ GrB_Info GB (_unop_apply__log1p_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__log1p_fp64_fp64) +GrB_Info GB (_uop_tran__log1p_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6272,7 +6272,7 @@ GrB_Info GB (_unop_tran__log1p_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__log1p_fc32_fc32) +GrB_Info GB (_uop_apply__log1p_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6281,7 +6281,7 @@ GrB_Info GB (_unop_apply__log1p_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__log1p_fc32_fc32) +GrB_Info GB (_uop_tran__log1p_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6292,7 +6292,7 @@ GrB_Info GB (_unop_tran__log1p_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__log1p_fc64_fc64) +GrB_Info GB (_uop_apply__log1p_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6301,7 +6301,7 @@ GrB_Info GB (_unop_apply__log1p_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__log1p_fc64_fc64) +GrB_Info GB (_uop_tran__log1p_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6312,7 +6312,7 @@ GrB_Info GB (_unop_tran__log1p_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__log2_fp32_fp32) +GrB_Info GB (_uop_apply__log2_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6321,7 +6321,7 @@ GrB_Info GB (_unop_apply__log2_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__log2_fp32_fp32) +GrB_Info GB (_uop_tran__log2_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6332,7 +6332,7 @@ GrB_Info GB (_unop_tran__log2_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__log2_fp64_fp64) +GrB_Info GB (_uop_apply__log2_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6341,7 +6341,7 @@ GrB_Info GB (_unop_apply__log2_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__log2_fp64_fp64) +GrB_Info GB (_uop_tran__log2_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6352,7 +6352,7 @@ GrB_Info GB (_unop_tran__log2_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__log2_fc32_fc32) +GrB_Info GB (_uop_apply__log2_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6361,7 +6361,7 @@ GrB_Info GB (_unop_apply__log2_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__log2_fc32_fc32) +GrB_Info GB (_uop_tran__log2_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6372,7 +6372,7 @@ GrB_Info GB (_unop_tran__log2_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__log2_fc64_fc64) +GrB_Info GB (_uop_apply__log2_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6381,7 +6381,7 @@ GrB_Info GB (_unop_apply__log2_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__log2_fc64_fc64) +GrB_Info GB (_uop_tran__log2_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6392,7 +6392,7 @@ GrB_Info GB (_unop_tran__log2_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__frexpx_fp32_fp32) +GrB_Info GB (_uop_apply__frexpx_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6401,7 +6401,7 @@ GrB_Info GB (_unop_apply__frexpx_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__frexpx_fp32_fp32) +GrB_Info GB (_uop_tran__frexpx_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6412,7 +6412,7 @@ GrB_Info GB (_unop_tran__frexpx_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__frexpx_fp64_fp64) +GrB_Info GB (_uop_apply__frexpx_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6421,7 +6421,7 @@ GrB_Info GB (_unop_apply__frexpx_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__frexpx_fp64_fp64) +GrB_Info GB (_uop_tran__frexpx_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6432,7 +6432,7 @@ GrB_Info GB (_unop_tran__frexpx_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__frexpe_fp32_fp32) +GrB_Info GB (_uop_apply__frexpe_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6441,7 +6441,7 @@ GrB_Info GB (_unop_apply__frexpe_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__frexpe_fp32_fp32) +GrB_Info GB (_uop_tran__frexpe_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6452,7 +6452,7 @@ GrB_Info GB (_unop_tran__frexpe_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__frexpe_fp64_fp64) +GrB_Info GB (_uop_apply__frexpe_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6461,7 +6461,7 @@ GrB_Info GB (_unop_apply__frexpe_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__frexpe_fp64_fp64) +GrB_Info GB (_uop_tran__frexpe_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6472,7 +6472,7 @@ GrB_Info GB (_unop_tran__frexpe_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__lgamma_fp32_fp32) +GrB_Info GB (_uop_apply__lgamma_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6481,7 +6481,7 @@ GrB_Info GB (_unop_apply__lgamma_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__lgamma_fp32_fp32) +GrB_Info GB (_uop_tran__lgamma_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6492,7 +6492,7 @@ GrB_Info GB (_unop_tran__lgamma_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__lgamma_fp64_fp64) +GrB_Info GB (_uop_apply__lgamma_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6501,7 +6501,7 @@ GrB_Info GB (_unop_apply__lgamma_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__lgamma_fp64_fp64) +GrB_Info GB (_uop_tran__lgamma_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6512,7 +6512,7 @@ GrB_Info GB (_unop_tran__lgamma_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__tgamma_fp32_fp32) +GrB_Info GB (_uop_apply__tgamma_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6521,7 +6521,7 @@ GrB_Info GB (_unop_apply__tgamma_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__tgamma_fp32_fp32) +GrB_Info GB (_uop_tran__tgamma_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6532,7 +6532,7 @@ GrB_Info GB (_unop_tran__tgamma_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__tgamma_fp64_fp64) +GrB_Info GB (_uop_apply__tgamma_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6541,7 +6541,7 @@ GrB_Info GB (_unop_apply__tgamma_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__tgamma_fp64_fp64) +GrB_Info GB (_uop_tran__tgamma_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6552,7 +6552,7 @@ GrB_Info GB (_unop_tran__tgamma_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__erf_fp32_fp32) +GrB_Info GB (_uop_apply__erf_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6561,7 +6561,7 @@ GrB_Info GB (_unop_apply__erf_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__erf_fp32_fp32) +GrB_Info GB (_uop_tran__erf_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6572,7 +6572,7 @@ GrB_Info GB (_unop_tran__erf_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__erf_fp64_fp64) +GrB_Info GB (_uop_apply__erf_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6581,7 +6581,7 @@ GrB_Info GB (_unop_apply__erf_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__erf_fp64_fp64) +GrB_Info GB (_uop_tran__erf_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6592,7 +6592,7 @@ GrB_Info GB (_unop_tran__erf_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__erfc_fp32_fp32) +GrB_Info GB (_uop_apply__erfc_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6601,7 +6601,7 @@ GrB_Info GB (_unop_apply__erfc_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__erfc_fp32_fp32) +GrB_Info GB (_uop_tran__erfc_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6612,7 +6612,7 @@ GrB_Info GB (_unop_tran__erfc_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__erfc_fp64_fp64) +GrB_Info GB (_uop_apply__erfc_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6621,7 +6621,7 @@ GrB_Info GB (_unop_apply__erfc_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__erfc_fp64_fp64) +GrB_Info GB (_uop_tran__erfc_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6632,7 +6632,7 @@ GrB_Info GB (_unop_tran__erfc_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__cbrt_fp32_fp32) +GrB_Info GB (_uop_apply__cbrt_fp32_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6641,7 +6641,7 @@ GrB_Info GB (_unop_apply__cbrt_fp32_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__cbrt_fp32_fp32) +GrB_Info GB (_uop_tran__cbrt_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6652,7 +6652,7 @@ GrB_Info GB (_unop_tran__cbrt_fp32_fp32) ) ; -GrB_Info GB (_unop_apply__cbrt_fp64_fp64) +GrB_Info GB (_uop_apply__cbrt_fp64_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6661,7 +6661,7 @@ GrB_Info GB (_unop_apply__cbrt_fp64_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__cbrt_fp64_fp64) +GrB_Info GB (_uop_tran__cbrt_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6672,7 +6672,7 @@ GrB_Info GB (_unop_tran__cbrt_fp64_fp64) ) ; -GrB_Info GB (_unop_apply__conj_fc32_fc32) +GrB_Info GB (_uop_apply__conj_fc32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6681,7 +6681,7 @@ GrB_Info GB (_unop_apply__conj_fc32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__conj_fc32_fc32) +GrB_Info GB (_uop_tran__conj_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6692,7 +6692,7 @@ GrB_Info GB (_unop_tran__conj_fc32_fc32) ) ; -GrB_Info GB (_unop_apply__conj_fc64_fc64) +GrB_Info GB (_uop_apply__conj_fc64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6701,7 +6701,7 @@ GrB_Info GB (_unop_apply__conj_fc64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__conj_fc64_fc64) +GrB_Info GB (_uop_tran__conj_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6712,7 +6712,7 @@ GrB_Info GB (_unop_tran__conj_fc64_fc64) ) ; -GrB_Info GB (_unop_apply__abs_fp32_fc32) +GrB_Info GB (_uop_apply__abs_fp32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6721,7 +6721,7 @@ GrB_Info GB (_unop_apply__abs_fp32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_fp32_fc32) +GrB_Info GB (_uop_tran__abs_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6732,7 +6732,7 @@ GrB_Info GB (_unop_tran__abs_fp32_fc32) ) ; -GrB_Info GB (_unop_apply__abs_fp64_fc64) +GrB_Info GB (_uop_apply__abs_fp64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6741,7 +6741,7 @@ GrB_Info GB (_unop_apply__abs_fp64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__abs_fp64_fc64) +GrB_Info GB (_uop_tran__abs_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6752,7 +6752,7 @@ GrB_Info GB (_unop_tran__abs_fp64_fc64) ) ; -GrB_Info GB (_unop_apply__creal_fp32_fc32) +GrB_Info GB (_uop_apply__creal_fp32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6761,7 +6761,7 @@ GrB_Info GB (_unop_apply__creal_fp32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__creal_fp32_fc32) +GrB_Info GB (_uop_tran__creal_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6772,7 +6772,7 @@ GrB_Info GB (_unop_tran__creal_fp32_fc32) ) ; -GrB_Info GB (_unop_apply__creal_fp64_fc64) +GrB_Info GB (_uop_apply__creal_fp64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6781,7 +6781,7 @@ GrB_Info GB (_unop_apply__creal_fp64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__creal_fp64_fc64) +GrB_Info GB (_uop_tran__creal_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6792,7 +6792,7 @@ GrB_Info GB (_unop_tran__creal_fp64_fc64) ) ; -GrB_Info GB (_unop_apply__cimag_fp32_fc32) +GrB_Info GB (_uop_apply__cimag_fp32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6801,7 +6801,7 @@ GrB_Info GB (_unop_apply__cimag_fp32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__cimag_fp32_fc32) +GrB_Info GB (_uop_tran__cimag_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6812,7 +6812,7 @@ GrB_Info GB (_unop_tran__cimag_fp32_fc32) ) ; -GrB_Info GB (_unop_apply__cimag_fp64_fc64) +GrB_Info GB (_uop_apply__cimag_fp64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6821,7 +6821,7 @@ GrB_Info GB (_unop_apply__cimag_fp64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__cimag_fp64_fc64) +GrB_Info GB (_uop_tran__cimag_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6832,7 +6832,7 @@ GrB_Info GB (_unop_tran__cimag_fp64_fc64) ) ; -GrB_Info GB (_unop_apply__carg_fp32_fc32) +GrB_Info GB (_uop_apply__carg_fp32_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6841,7 +6841,7 @@ GrB_Info GB (_unop_apply__carg_fp32_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__carg_fp32_fc32) +GrB_Info GB (_uop_tran__carg_fp32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6852,7 +6852,7 @@ GrB_Info GB (_unop_tran__carg_fp32_fc32) ) ; -GrB_Info GB (_unop_apply__carg_fp64_fc64) +GrB_Info GB (_uop_apply__carg_fp64_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6861,7 +6861,7 @@ GrB_Info GB (_unop_apply__carg_fp64_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__carg_fp64_fc64) +GrB_Info GB (_uop_tran__carg_fp64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6872,7 +6872,7 @@ GrB_Info GB (_unop_tran__carg_fp64_fc64) ) ; -GrB_Info GB (_unop_apply__isinf_bool_fp32) +GrB_Info GB (_uop_apply__isinf_bool_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6881,7 +6881,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__isinf_bool_fp32) +GrB_Info GB (_uop_tran__isinf_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6892,7 +6892,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fp32) ) ; -GrB_Info GB (_unop_apply__isinf_bool_fp64) +GrB_Info GB (_uop_apply__isinf_bool_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6901,7 +6901,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__isinf_bool_fp64) +GrB_Info GB (_uop_tran__isinf_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6912,7 +6912,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fp64) ) ; -GrB_Info GB (_unop_apply__isinf_bool_fc32) +GrB_Info GB (_uop_apply__isinf_bool_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -6921,7 +6921,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__isinf_bool_fc32) +GrB_Info GB (_uop_tran__isinf_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6932,7 +6932,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fc32) ) ; -GrB_Info GB (_unop_apply__isinf_bool_fc64) +GrB_Info GB (_uop_apply__isinf_bool_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -6941,7 +6941,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__isinf_bool_fc64) +GrB_Info GB (_uop_tran__isinf_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6952,7 +6952,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fc64) ) ; -GrB_Info GB (_unop_apply__isnan_bool_fp32) +GrB_Info GB (_uop_apply__isnan_bool_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -6961,7 +6961,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__isnan_bool_fp32) +GrB_Info GB (_uop_tran__isnan_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -6972,7 +6972,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fp32) ) ; -GrB_Info GB (_unop_apply__isnan_bool_fp64) +GrB_Info GB (_uop_apply__isnan_bool_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -6981,7 +6981,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__isnan_bool_fp64) +GrB_Info GB (_uop_tran__isnan_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -6992,7 +6992,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fp64) ) ; -GrB_Info GB (_unop_apply__isnan_bool_fc32) +GrB_Info GB (_uop_apply__isnan_bool_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -7001,7 +7001,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__isnan_bool_fc32) +GrB_Info GB (_uop_tran__isnan_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -7012,7 +7012,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fc32) ) ; -GrB_Info GB (_unop_apply__isnan_bool_fc64) +GrB_Info GB (_uop_apply__isnan_bool_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -7021,7 +7021,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__isnan_bool_fc64) +GrB_Info GB (_uop_tran__isnan_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -7032,7 +7032,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fc64) ) ; -GrB_Info GB (_unop_apply__isfinite_bool_fp32) +GrB_Info GB (_uop_apply__isfinite_bool_fp32) ( GB_void *Cx, const GB_void *Ax, @@ -7041,7 +7041,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fp32) int nthreads ) ; -GrB_Info GB (_unop_tran__isfinite_bool_fp32) +GrB_Info GB (_uop_tran__isfinite_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -7052,7 +7052,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fp32) ) ; -GrB_Info GB (_unop_apply__isfinite_bool_fp64) +GrB_Info GB (_uop_apply__isfinite_bool_fp64) ( GB_void *Cx, const GB_void *Ax, @@ -7061,7 +7061,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fp64) int nthreads ) ; -GrB_Info GB (_unop_tran__isfinite_bool_fp64) +GrB_Info GB (_uop_tran__isfinite_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -7072,7 +7072,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fp64) ) ; -GrB_Info GB (_unop_apply__isfinite_bool_fc32) +GrB_Info GB (_uop_apply__isfinite_bool_fc32) ( GB_void *Cx, const GB_void *Ax, @@ -7081,7 +7081,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fc32) int nthreads ) ; -GrB_Info GB (_unop_tran__isfinite_bool_fc32) +GrB_Info GB (_uop_tran__isfinite_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -7092,7 +7092,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fc32) ) ; -GrB_Info GB (_unop_apply__isfinite_bool_fc64) +GrB_Info GB (_uop_apply__isfinite_bool_fc64) ( GB_void *Cx, const GB_void *Ax, @@ -7101,7 +7101,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fc64) int nthreads ) ; -GrB_Info GB (_unop_tran__isfinite_bool_fc64) +GrB_Info GB (_uop_tran__isfinite_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fc32.c index 34aa5e7a0c..718fc60bc2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cisfinitef (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isfinite_bool_fc32) +GrB_Info GB (_uop_apply__isfinite_bool_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isfinite_bool_fc32) +GrB_Info GB (_uop_tran__isfinite_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fc64.c index af0572d37b..1af1318a8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cisfinite (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isfinite_bool_fc64) +GrB_Info GB (_uop_apply__isfinite_bool_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isfinite_bool_fc64) +GrB_Info GB (_uop_tran__isfinite_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fp32.c index 313b0d3439..0256e3745e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = isfinite (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isfinite_bool_fp32) +GrB_Info GB (_uop_apply__isfinite_bool_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isfinite_bool_fp32) +GrB_Info GB (_uop_tran__isfinite_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fp64.c index 228391a970..777d673ba9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isfinite_bool_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isfinite_bool_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = isfinite (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isfinite_bool_fp64) +GrB_Info GB (_uop_apply__isfinite_bool_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isfinite_bool_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isfinite_bool_fp64) +GrB_Info GB (_uop_tran__isfinite_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isfinite_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fc32.c index 7bd210dec5..6b375066a6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cisinff (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isinf_bool_fc32) +GrB_Info GB (_uop_apply__isinf_bool_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isinf_bool_fc32) +GrB_Info GB (_uop_tran__isinf_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fc64.c index 3d6bc8c8e7..7dc6df2b96 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cisinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isinf_bool_fc64) +GrB_Info GB (_uop_apply__isinf_bool_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isinf_bool_fc64) +GrB_Info GB (_uop_tran__isinf_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fp32.c index ea6ad99af9..cf4740cdcf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = isinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isinf_bool_fp32) +GrB_Info GB (_uop_apply__isinf_bool_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isinf_bool_fp32) +GrB_Info GB (_uop_tran__isinf_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fp64.c index 5c4cb5392c..4f548e67a9 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isinf_bool_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isinf_bool_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = isinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isinf_bool_fp64) +GrB_Info GB (_uop_apply__isinf_bool_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isinf_bool_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isinf_bool_fp64) +GrB_Info GB (_uop_tran__isinf_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isinf_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fc32.c index 87e78d95b3..07fa6f116f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cisnanf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isnan_bool_fc32) +GrB_Info GB (_uop_apply__isnan_bool_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isnan_bool_fc32) +GrB_Info GB (_uop_tran__isnan_bool_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fc64.c index b8784291b0..4ef693970c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cisnan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isnan_bool_fc64) +GrB_Info GB (_uop_apply__isnan_bool_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isnan_bool_fc64) +GrB_Info GB (_uop_tran__isnan_bool_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fp32.c index 3070e1bf3e..f11b31b984 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = isnan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isnan_bool_fp32) +GrB_Info GB (_uop_apply__isnan_bool_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isnan_bool_fp32) +GrB_Info GB (_uop_tran__isnan_bool_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fp64.c index 65f0fd0c94..db05b54103 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__isnan_bool_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__isnan_bool_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = isnan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__isnan_bool_fp64) +GrB_Info GB (_uop_apply__isnan_bool_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__isnan_bool_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__isnan_bool_fp64) +GrB_Info GB (_uop_tran__isnan_bool_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__isnan_bool_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lgamma_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__lgamma_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lgamma_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__lgamma_fp32_fp32.c index 440ce2e62b..1fbac97dbf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lgamma_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lgamma_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = lgammaf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lgamma_fp32_fp32) +GrB_Info GB (_uop_apply__lgamma_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lgamma_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lgamma_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lgamma_fp32_fp32) +GrB_Info GB (_uop_tran__lgamma_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lgamma_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lgamma_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__lgamma_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lgamma_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__lgamma_fp64_fp64.c index 7383197588..321e092624 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lgamma_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lgamma_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = lgamma (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lgamma_fp64_fp64) +GrB_Info GB (_uop_apply__lgamma_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lgamma_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lgamma_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lgamma_fp64_fp64) +GrB_Info GB (_uop_tran__lgamma_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lgamma_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_bool_bool.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_bool_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_bool_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_bool_bool.c index f61965b3ed..3201755675 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_bool_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_bool_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_bool_bool) +GrB_Info GB (_uop_apply__lnot_bool_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_bool_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_bool_bool) +GrB_Info GB (_uop_tran__lnot_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_fp32_fp32.c index 1165b6cf72..b49a27fb8e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_fp32_fp32) +GrB_Info GB (_uop_apply__lnot_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_fp32_fp32) +GrB_Info GB (_uop_tran__lnot_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_fp64_fp64.c index 5dd63bdc45..f2cdb99be8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_fp64_fp64) +GrB_Info GB (_uop_apply__lnot_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_fp64_fp64) +GrB_Info GB (_uop_tran__lnot_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_int16_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_int16_int16.c index f1f0476238..63f730a126 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_int16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_int16_int16) +GrB_Info GB (_uop_apply__lnot_int16_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_int16_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_int16_int16) +GrB_Info GB (_uop_tran__lnot_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_int32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_int32_int32.c index ef48b86150..939027f42b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_int32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_int32_int32) +GrB_Info GB (_uop_apply__lnot_int32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_int32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_int32_int32) +GrB_Info GB (_uop_tran__lnot_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_int64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_int64_int64.c index 82df8497ef..7e4311529f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_int64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_int64_int64) +GrB_Info GB (_uop_apply__lnot_int64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_int64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_int64_int64) +GrB_Info GB (_uop_tran__lnot_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_int8_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_int8_int8.c index fb4f6e41ea..ef51ac02ee 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_int8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_int8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_int8_int8) +GrB_Info GB (_uop_apply__lnot_int8_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_int8_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_int8_int8) +GrB_Info GB (_uop_tran__lnot_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint16_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_uint16_uint16.c index 04b894b813..ba66b5c5ed 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_uint16_uint16) +GrB_Info GB (_uop_apply__lnot_uint16_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_uint16_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_uint16_uint16) +GrB_Info GB (_uop_tran__lnot_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_uint32_uint32.c index 1f6c2f0e6c..0130eb67c8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_uint32_uint32) +GrB_Info GB (_uop_apply__lnot_uint32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_uint32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_uint32_uint32) +GrB_Info GB (_uop_tran__lnot_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_uint64_uint64.c index 526e636b41..856b40fc36 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_uint64_uint64) +GrB_Info GB (_uop_apply__lnot_uint64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_uint64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_uint64_uint64) +GrB_Info GB (_uop_tran__lnot_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint8_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__lnot_uint8_uint8.c index 8b3e96a56f..50d65642a1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__lnot_uint8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__lnot_uint8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = !(x != 0) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__lnot_uint8_uint8) +GrB_Info GB (_uop_apply__lnot_uint8_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__lnot_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__lnot_uint8_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__lnot_uint8_uint8) +GrB_Info GB (_uop_tran__lnot_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__lnot_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__log10_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log10_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__log10_fc32_fc32.c index 5b81dd7296..e270a30869 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log10_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog10f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log10_fc32_fc32) +GrB_Info GB (_uop_apply__log10_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log10_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log10_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log10_fc32_fc32) +GrB_Info GB (_uop_tran__log10_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log10_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__log10_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log10_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__log10_fc64_fc64.c index 433a99fb5f..6040f2c7b4 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log10_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog10 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log10_fc64_fc64) +GrB_Info GB (_uop_apply__log10_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log10_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log10_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log10_fc64_fc64) +GrB_Info GB (_uop_tran__log10_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log10_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__log10_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log10_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__log10_fp32_fp32.c index 5ccc77e3a0..584694efb1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log10_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log10f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log10_fp32_fp32) +GrB_Info GB (_uop_apply__log10_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log10_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log10_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log10_fp32_fp32) +GrB_Info GB (_uop_tran__log10_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log10_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__log10_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log10_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__log10_fp64_fp64.c index ff35026a59..35774fd72d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log10_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log10_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log10 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log10_fp64_fp64) +GrB_Info GB (_uop_apply__log10_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log10_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log10_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log10_fp64_fp64) +GrB_Info GB (_uop_tran__log10_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log10_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__log1p_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__log1p_fc32_fc32.c index 871e848f76..8d779e8070 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log1p_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog1pf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log1p_fc32_fc32) +GrB_Info GB (_uop_apply__log1p_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log1p_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log1p_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log1p_fc32_fc32) +GrB_Info GB (_uop_tran__log1p_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log1p_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__log1p_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__log1p_fc64_fc64.c index bc866c4f37..b401400b2e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log1p_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog1p (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log1p_fc64_fc64) +GrB_Info GB (_uop_apply__log1p_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log1p_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log1p_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log1p_fc64_fc64) +GrB_Info GB (_uop_tran__log1p_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log1p_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__log1p_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__log1p_fp32_fp32.c index 58830b5c2d..4e78677fa0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log1p_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log1pf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log1p_fp32_fp32) +GrB_Info GB (_uop_apply__log1p_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log1p_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log1p_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log1p_fp32_fp32) +GrB_Info GB (_uop_tran__log1p_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log1p_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__log1p_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__log1p_fp64_fp64.c index 25b6b97bec..3349c58610 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log1p_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log1p_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log1p (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log1p_fp64_fp64) +GrB_Info GB (_uop_apply__log1p_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log1p_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log1p_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log1p_fp64_fp64) +GrB_Info GB (_uop_tran__log1p_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log1p_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__log2_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log2_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__log2_fc32_fc32.c index 80e356ca81..2cf2a1059d 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log2_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog2f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log2_fc32_fc32) +GrB_Info GB (_uop_apply__log2_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log2_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log2_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log2_fc32_fc32) +GrB_Info GB (_uop_tran__log2_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log2_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__log2_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log2_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__log2_fc64_fc64.c index f3ca2a23ab..6632acbd16 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log2_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog2 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log2_fc64_fc64) +GrB_Info GB (_uop_apply__log2_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log2_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log2_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log2_fc64_fc64) +GrB_Info GB (_uop_tran__log2_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log2_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__log2_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log2_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__log2_fp32_fp32.c index 1b04f1149f..62718854ac 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log2_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log2f (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log2_fp32_fp32) +GrB_Info GB (_uop_apply__log2_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log2_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log2_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log2_fp32_fp32) +GrB_Info GB (_uop_tran__log2_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log2_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__log2_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log2_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__log2_fp64_fp64.c index 6eea8d3d07..fc63c1622f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log2_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log2_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log2 (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log2_fp64_fp64) +GrB_Info GB (_uop_apply__log2_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log2_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log2_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log2_fp64_fp64) +GrB_Info GB (_uop_tran__log2_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log2_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__log_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__log_fc32_fc32.c index 7aac8299d4..55bc220427 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clogf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log_fc32_fc32) +GrB_Info GB (_uop_apply__log_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log_fc32_fc32) +GrB_Info GB (_uop_tran__log_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__log_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__log_fc64_fc64.c index 5dde8c764d..d6d9d65c3a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_clog (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log_fc64_fc64) +GrB_Info GB (_uop_apply__log_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log_fc64_fc64) +GrB_Info GB (_uop_tran__log_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__log_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__log_fp32_fp32.c index 5aa4f800e3..1b09763dae 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = logf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log_fp32_fp32) +GrB_Info GB (_uop_apply__log_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log_fp32_fp32) +GrB_Info GB (_uop_tran__log_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__log_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__log_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__log_fp64_fp64.c index 09d145bb42..6689ce85ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__log_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__log_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = log (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__log_fp64_fp64) +GrB_Info GB (_uop_apply__log_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__log_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__log_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__log_fp64_fp64) +GrB_Info GB (_uop_tran__log_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__log_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_bool_bool.c b/GraphBLAS/FactoryKernels/GB_uop__minv_bool_bool.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_bool_bool.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_bool_bool.c index a9c4a90081..1067fedcf0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_bool_bool.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_bool_bool.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = true @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_bool_bool) +GrB_Info GB (_uop_apply__minv_bool_bool) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_bool_bool) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_bool_bool) +GrB_Info GB (_uop_tran__minv_bool_bool) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_bool_bool) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__minv_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_fc32_fc32.c index ca693ca2bc..c1f28d3ee2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_FC32_div (GxB_CMPLXF (1,0), x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_fc32_fc32) +GrB_Info GB (_uop_apply__minv_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_fc32_fc32) +GrB_Info GB (_uop_tran__minv_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__minv_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_fc64_fc64.c index c8fc54b9c3..7bcd758910 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_FC64_div (GxB_CMPLX (1,0), x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_fc64_fc64) +GrB_Info GB (_uop_apply__minv_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_fc64_fc64) +GrB_Info GB (_uop_tran__minv_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__minv_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_fp32_fp32.c index 9e336cdc16..e734b85ac1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = (1.0F)/x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_fp32_fp32) +GrB_Info GB (_uop_apply__minv_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_fp32_fp32) +GrB_Info GB (_uop_tran__minv_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__minv_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_fp64_fp64.c index 53302b9375..be354720eb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = 1./x @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_fp64_fp64) +GrB_Info GB (_uop_apply__minv_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_fp64_fp64) +GrB_Info GB (_uop_tran__minv_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int16_int16.c b/GraphBLAS/FactoryKernels/GB_uop__minv_int16_int16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_int16_int16.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_int16_int16.c index 52aa5f632e..63c3ebba3a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int16_int16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_int16_int16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_int16 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_int16_int16) +GrB_Info GB (_uop_apply__minv_int16_int16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_int16_int16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_int16_int16) +GrB_Info GB (_uop_tran__minv_int16_int16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_int16_int16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int32_int32.c b/GraphBLAS/FactoryKernels/GB_uop__minv_int32_int32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_int32_int32.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_int32_int32.c index 6b2dcb3c79..c0c02c37a2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int32_int32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_int32_int32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_int32 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_int32_int32) +GrB_Info GB (_uop_apply__minv_int32_int32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_int32_int32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_int32_int32) +GrB_Info GB (_uop_tran__minv_int32_int32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_int32_int32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int64_int64.c b/GraphBLAS/FactoryKernels/GB_uop__minv_int64_int64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_int64_int64.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_int64_int64.c index da98039d43..de31b158bf 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int64_int64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_int64_int64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_int64 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_int64_int64) +GrB_Info GB (_uop_apply__minv_int64_int64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_int64_int64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_int64_int64) +GrB_Info GB (_uop_tran__minv_int64_int64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_int64_int64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int8_int8.c b/GraphBLAS/FactoryKernels/GB_uop__minv_int8_int8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_int8_int8.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_int8_int8.c index 27e2bcb738..c910b37da2 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_int8_int8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_int8_int8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_int8 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_int8_int8) +GrB_Info GB (_uop_apply__minv_int8_int8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_int8_int8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_int8_int8) +GrB_Info GB (_uop_tran__minv_int8_int8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_int8_int8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint16_uint16.c b/GraphBLAS/FactoryKernels/GB_uop__minv_uint16_uint16.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint16_uint16.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_uint16_uint16.c index 3158079a89..cc83669ce6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint16_uint16.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_uint16_uint16.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_uint16 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_uint16_uint16) +GrB_Info GB (_uop_apply__minv_uint16_uint16) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_uint16_uint16) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_uint16_uint16) +GrB_Info GB (_uop_tran__minv_uint16_uint16) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_uint16_uint16) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint32_uint32.c b/GraphBLAS/FactoryKernels/GB_uop__minv_uint32_uint32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint32_uint32.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_uint32_uint32.c index 0551a7b932..aa1f2b5f64 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint32_uint32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_uint32_uint32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_uint32 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_uint32_uint32) +GrB_Info GB (_uop_apply__minv_uint32_uint32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_uint32_uint32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_uint32_uint32) +GrB_Info GB (_uop_tran__minv_uint32_uint32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_uint32_uint32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint64_uint64.c b/GraphBLAS/FactoryKernels/GB_uop__minv_uint64_uint64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint64_uint64.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_uint64_uint64.c index 5b02f77e73..4503a9ac88 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint64_uint64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_uint64_uint64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_uint64 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_uint64_uint64) +GrB_Info GB (_uop_apply__minv_uint64_uint64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_uint64_uint64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_uint64_uint64) +GrB_Info GB (_uop_tran__minv_uint64_uint64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_uint64_uint64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint8_uint8.c b/GraphBLAS/FactoryKernels/GB_uop__minv_uint8_uint8.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint8_uint8.c rename to GraphBLAS/FactoryKernels/GB_uop__minv_uint8_uint8.c index ca6b1aa812..73271314dd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__minv_uint8_uint8.c +++ b/GraphBLAS/FactoryKernels/GB_uop__minv_uint8_uint8.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_idiv_uint8 (1, x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__minv_uint8_uint8) +GrB_Info GB (_uop_apply__minv_uint8_uint8) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__minv_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__minv_uint8_uint8) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__minv_uint8_uint8) +GrB_Info GB (_uop_tran__minv_uint8_uint8) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__minv_uint8_uint8) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__round_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__round_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__round_fc32_fc32.c index 2f3b830b15..fce65d448f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__round_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_croundf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__round_fc32_fc32) +GrB_Info GB (_uop_apply__round_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__round_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__round_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__round_fc32_fc32) +GrB_Info GB (_uop_tran__round_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__round_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__round_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__round_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__round_fc64_fc64.c index f465b17fee..e9793a89ec 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__round_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_cround (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__round_fc64_fc64) +GrB_Info GB (_uop_apply__round_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__round_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__round_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__round_fc64_fc64) +GrB_Info GB (_uop_tran__round_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__round_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__round_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__round_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__round_fp32_fp32.c index 2a8370713d..d883f1d8b7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__round_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = roundf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__round_fp32_fp32) +GrB_Info GB (_uop_apply__round_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__round_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__round_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__round_fp32_fp32) +GrB_Info GB (_uop_tran__round_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__round_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__round_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__round_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__round_fp64_fp64.c index 9eb763fbe8..0fbb2d1ac3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__round_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__round_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = round (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__round_fp64_fp64) +GrB_Info GB (_uop_apply__round_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__round_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__round_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__round_fp64_fp64) +GrB_Info GB (_uop_tran__round_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__round_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__signum_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__signum_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__signum_fc32_fc32.c index 058a1dbf5e..2b7af1990a 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__signum_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csignumf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__signum_fc32_fc32) +GrB_Info GB (_uop_apply__signum_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__signum_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__signum_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__signum_fc32_fc32) +GrB_Info GB (_uop_tran__signum_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__signum_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__signum_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__signum_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__signum_fc64_fc64.c index a64a910972..b3e1d9065c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__signum_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csignum (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__signum_fc64_fc64) +GrB_Info GB (_uop_apply__signum_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__signum_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__signum_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__signum_fc64_fc64) +GrB_Info GB (_uop_tran__signum_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__signum_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__signum_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__signum_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__signum_fp32_fp32.c index a1fd84d344..75491b1c81 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__signum_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_signumf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__signum_fp32_fp32) +GrB_Info GB (_uop_apply__signum_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__signum_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__signum_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__signum_fp32_fp32) +GrB_Info GB (_uop_tran__signum_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__signum_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__signum_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__signum_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__signum_fp64_fp64.c index 8f625c4288..11bc9ab205 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__signum_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__signum_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_signum (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__signum_fp64_fp64) +GrB_Info GB (_uop_apply__signum_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__signum_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__signum_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__signum_fp64_fp64) +GrB_Info GB (_uop_tran__signum_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__signum_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__sin_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sin_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__sin_fc32_fc32.c index 06ed030e17..3caa5208c1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sin_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sin_fc32_fc32) +GrB_Info GB (_uop_apply__sin_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sin_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sin_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sin_fc32_fc32) +GrB_Info GB (_uop_tran__sin_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sin_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__sin_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sin_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__sin_fc64_fc64.c index 59fcd934b6..305c80f952 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sin_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csin (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sin_fc64_fc64) +GrB_Info GB (_uop_apply__sin_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sin_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sin_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sin_fc64_fc64) +GrB_Info GB (_uop_tran__sin_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sin_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__sin_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sin_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__sin_fp32_fp32.c index d9c6d9446f..fcc96a97d8 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sin_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = sinf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sin_fp32_fp32) +GrB_Info GB (_uop_apply__sin_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sin_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sin_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sin_fp32_fp32) +GrB_Info GB (_uop_tran__sin_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sin_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__sin_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sin_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__sin_fp64_fp64.c index 9accf567b4..23e655cd05 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sin_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sin_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = sin (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sin_fp64_fp64) +GrB_Info GB (_uop_apply__sin_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sin_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sin_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sin_fp64_fp64) +GrB_Info GB (_uop_tran__sin_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sin_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__sinh_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__sinh_fc32_fc32.c index 59d0fd895d..ec79b60ca3 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sinh_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csinhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sinh_fc32_fc32) +GrB_Info GB (_uop_apply__sinh_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sinh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sinh_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sinh_fc32_fc32) +GrB_Info GB (_uop_tran__sinh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sinh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__sinh_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__sinh_fc64_fc64.c index 0b88910959..03139bd931 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sinh_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csinh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sinh_fc64_fc64) +GrB_Info GB (_uop_apply__sinh_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sinh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sinh_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sinh_fc64_fc64) +GrB_Info GB (_uop_tran__sinh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sinh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__sinh_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__sinh_fp32_fp32.c index 257f9e11c2..a8b4deef5e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sinh_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = sinhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sinh_fp32_fp32) +GrB_Info GB (_uop_apply__sinh_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sinh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sinh_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sinh_fp32_fp32) +GrB_Info GB (_uop_tran__sinh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sinh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__sinh_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__sinh_fp64_fp64.c index 6c97ce8f3c..635c3992fd 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sinh_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sinh_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = sinh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sinh_fp64_fp64) +GrB_Info GB (_uop_apply__sinh_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sinh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sinh_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sinh_fp64_fp64) +GrB_Info GB (_uop_tran__sinh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sinh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__sqrt_fc32_fc32.c index 0583c3898a..b782021986 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csqrtf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sqrt_fc32_fc32) +GrB_Info GB (_uop_apply__sqrt_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sqrt_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sqrt_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sqrt_fc32_fc32) +GrB_Info GB (_uop_tran__sqrt_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sqrt_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__sqrt_fc64_fc64.c index c8570d2b0c..2f7a5b61e0 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_csqrt (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sqrt_fc64_fc64) +GrB_Info GB (_uop_apply__sqrt_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sqrt_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sqrt_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sqrt_fc64_fc64) +GrB_Info GB (_uop_tran__sqrt_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sqrt_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__sqrt_fp32_fp32.c index 14d5fd69be..21fefdab29 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = sqrtf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sqrt_fp32_fp32) +GrB_Info GB (_uop_apply__sqrt_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sqrt_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sqrt_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sqrt_fp32_fp32) +GrB_Info GB (_uop_tran__sqrt_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sqrt_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__sqrt_fp64_fp64.c index f24a7f3686..ba5271792b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__sqrt_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__sqrt_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = sqrt (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__sqrt_fp64_fp64) +GrB_Info GB (_uop_apply__sqrt_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__sqrt_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__sqrt_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__sqrt_fp64_fp64) +GrB_Info GB (_uop_tran__sqrt_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__sqrt_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__tan_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tan_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__tan_fc32_fc32.c index 4e6167e939..1e5ce41805 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tan_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ctanf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tan_fc32_fc32) +GrB_Info GB (_uop_apply__tan_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tan_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tan_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tan_fc32_fc32) +GrB_Info GB (_uop_tran__tan_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tan_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__tan_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tan_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__tan_fc64_fc64.c index cf5c3076be..24d40f550c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tan_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ctan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tan_fc64_fc64) +GrB_Info GB (_uop_apply__tan_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tan_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tan_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tan_fc64_fc64) +GrB_Info GB (_uop_tran__tan_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tan_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__tan_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tan_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__tan_fp32_fp32.c index 89bd2d5fbc..f0e2a3a5c6 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tan_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = tanf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tan_fp32_fp32) +GrB_Info GB (_uop_apply__tan_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tan_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tan_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tan_fp32_fp32) +GrB_Info GB (_uop_tran__tan_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tan_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__tan_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tan_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__tan_fp64_fp64.c index 89367ede82..990e34fb8b 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tan_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tan_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = tan (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tan_fp64_fp64) +GrB_Info GB (_uop_apply__tan_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tan_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tan_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tan_fp64_fp64) +GrB_Info GB (_uop_tran__tan_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tan_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__tanh_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__tanh_fc32_fc32.c index 13cdaea646..15c62ce07f 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tanh_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ctanhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tanh_fc32_fc32) +GrB_Info GB (_uop_apply__tanh_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tanh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tanh_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tanh_fc32_fc32) +GrB_Info GB (_uop_tran__tanh_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tanh_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__tanh_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__tanh_fc64_fc64.c index 8ee548b7ab..d1cd246d7c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tanh_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ctanh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tanh_fc64_fc64) +GrB_Info GB (_uop_apply__tanh_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tanh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tanh_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tanh_fc64_fc64) +GrB_Info GB (_uop_tran__tanh_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tanh_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__tanh_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__tanh_fp32_fp32.c index ef27d9624d..06c8c8f72e 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tanh_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = tanhf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tanh_fp32_fp32) +GrB_Info GB (_uop_apply__tanh_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tanh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tanh_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tanh_fp32_fp32) +GrB_Info GB (_uop_tran__tanh_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tanh_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__tanh_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__tanh_fp64_fp64.c index 9d5b78117f..87334278d7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tanh_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tanh_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = tanh (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tanh_fp64_fp64) +GrB_Info GB (_uop_apply__tanh_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tanh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tanh_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tanh_fp64_fp64) +GrB_Info GB (_uop_tran__tanh_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tanh_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tgamma_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__tgamma_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tgamma_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__tgamma_fp32_fp32.c index 0c67abd250..53ad6c5ab7 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tgamma_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tgamma_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = tgammaf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tgamma_fp32_fp32) +GrB_Info GB (_uop_apply__tgamma_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tgamma_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tgamma_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tgamma_fp32_fp32) +GrB_Info GB (_uop_tran__tgamma_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tgamma_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__tgamma_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__tgamma_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__tgamma_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__tgamma_fp64_fp64.c index 0eb4e78d85..31dc9e0523 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__tgamma_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__tgamma_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = tgamma (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__tgamma_fp64_fp64) +GrB_Info GB (_uop_apply__tgamma_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__tgamma_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__tgamma_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__tgamma_fp64_fp64) +GrB_Info GB (_uop_tran__tgamma_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__tgamma_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fc32_fc32.c b/GraphBLAS/FactoryKernels/GB_uop__trunc_fc32_fc32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fc32_fc32.c rename to GraphBLAS/FactoryKernels/GB_uop__trunc_fc32_fc32.c index 7c5e53f44e..508c4fe12c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fc32_fc32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__trunc_fc32_fc32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ctruncf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__trunc_fc32_fc32) +GrB_Info GB (_uop_apply__trunc_fc32_fc32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__trunc_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__trunc_fc32_fc32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__trunc_fc32_fc32) +GrB_Info GB (_uop_tran__trunc_fc32_fc32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__trunc_fc32_fc32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fc64_fc64.c b/GraphBLAS/FactoryKernels/GB_uop__trunc_fc64_fc64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fc64_fc64.c rename to GraphBLAS/FactoryKernels/GB_uop__trunc_fc64_fc64.c index 2ab93cedaa..eeb7bd93fb 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fc64_fc64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__trunc_fc64_fc64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = GB_ctrunc (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__trunc_fc64_fc64) +GrB_Info GB (_uop_apply__trunc_fc64_fc64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__trunc_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__trunc_fc64_fc64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__trunc_fc64_fc64) +GrB_Info GB (_uop_tran__trunc_fc64_fc64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__trunc_fc64_fc64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fp32_fp32.c b/GraphBLAS/FactoryKernels/GB_uop__trunc_fp32_fp32.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fp32_fp32.c rename to GraphBLAS/FactoryKernels/GB_uop__trunc_fp32_fp32.c index dabb947cce..42a63f0a5c 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fp32_fp32.c +++ b/GraphBLAS/FactoryKernels/GB_uop__trunc_fp32_fp32.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = truncf (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__trunc_fp32_fp32) +GrB_Info GB (_uop_apply__trunc_fp32_fp32) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__trunc_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__trunc_fp32_fp32) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__trunc_fp32_fp32) +GrB_Info GB (_uop_tran__trunc_fp32_fp32) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__trunc_fp32_fp32) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fp64_fp64.c b/GraphBLAS/FactoryKernels/GB_uop__trunc_fp64_fp64.c similarity index 81% rename from GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fp64_fp64.c rename to GraphBLAS/FactoryKernels/GB_uop__trunc_fp64_fp64.c index bddfcec338..09b50157f1 100644 --- a/GraphBLAS/Source/FactoryKernels/GB_unop__trunc_fp64_fp64.c +++ b/GraphBLAS/FactoryKernels/GB_uop__trunc_fp64_fp64.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) #define GB_UNARYOP(z,x) z = trunc (x) @@ -30,7 +30,7 @@ /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } @@ -41,13 +41,13 @@ #define GB_DISABLE 0 #endif -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply__trunc_fp64_fp64) +GrB_Info GB (_uop_apply__trunc_fp64_fp64) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -59,7 +59,7 @@ GrB_Info GB (_unop_apply__trunc_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -68,7 +68,7 @@ GrB_Info GB (_unop_apply__trunc_fp64_fp64) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran__trunc_fp64_fp64) +GrB_Info GB (_uop_tran__trunc_fp64_fp64) ( GrB_Matrix C, const GrB_Matrix A, @@ -81,7 +81,7 @@ GrB_Info GB (_unop_tran__trunc_fp64_fp64) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/GraphBLAS/@GrB/log.m b/GraphBLAS/GraphBLAS/@GrB/log.m index ac55fe648d..d6f07bc694 100644 --- a/GraphBLAS/GraphBLAS/@GrB/log.m +++ b/GraphBLAS/GraphBLAS/@GrB/log.m @@ -10,5 +10,5 @@ % SPDX-License-Identifier: Apache-2.0 G = G.opaque ; -C = GrB (gb_check_imag_zero (gb_trig ('log', gbfull (G)))) ; +C = GrB (gb_make_real (gb_trig ('log', gbfull (G)))) ; diff --git a/GraphBLAS/GraphBLAS/@GrB/log10.m b/GraphBLAS/GraphBLAS/@GrB/log10.m index d29717f0f2..ecc21271a2 100644 --- a/GraphBLAS/GraphBLAS/@GrB/log10.m +++ b/GraphBLAS/GraphBLAS/@GrB/log10.m @@ -10,5 +10,5 @@ % SPDX-License-Identifier: Apache-2.0 G = G.opaque ; -C = GrB (gb_check_imag_zero (gb_trig ('log10', gbfull (G)))) ; +C = GrB (gb_make_real (gb_trig ('log10', gbfull (G)))) ; diff --git a/GraphBLAS/GraphBLAS/@GrB/log2.m b/GraphBLAS/GraphBLAS/@GrB/log2.m index 7b0df9ce67..cb65031282 100644 --- a/GraphBLAS/GraphBLAS/@GrB/log2.m +++ b/GraphBLAS/GraphBLAS/@GrB/log2.m @@ -18,7 +18,7 @@ if (nargout == 1) % C = log2 (G) - F = GrB (gb_check_imag_zero (gb_trig ('log2', gbfull (G)))) ; + F = GrB (gb_make_real (gb_trig ('log2', gbfull (G)))) ; else % [F,E] = log2 (G) type = gbtype (G) ; diff --git a/GraphBLAS/GraphBLAS/@GrB/private/gb_check_imag_zero.m b/GraphBLAS/GraphBLAS/@GrB/private/gb_make_real.m similarity index 71% rename from GraphBLAS/GraphBLAS/@GrB/private/gb_check_imag_zero.m rename to GraphBLAS/GraphBLAS/@GrB/private/gb_make_real.m index 3368721283..c290375619 100644 --- a/GraphBLAS/GraphBLAS/@GrB/private/gb_check_imag_zero.m +++ b/GraphBLAS/GraphBLAS/@GrB/private/gb_make_real.m @@ -1,5 +1,5 @@ -function C = gb_check_imag_zero (G) -%GB_TO_REAL_IF_IMAG_ZERO convert complex matrix to real if imag(G) is zero +function C = gb_make_real (G) +%GB_MAKE_REAL convert complex matrix to real if imag(G) is zero % SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 diff --git a/GraphBLAS/GraphBLAS/@GrB/private/gb_power.m b/GraphBLAS/GraphBLAS/@GrB/private/gb_power.m index 0304e21664..203a75fb94 100644 --- a/GraphBLAS/GraphBLAS/@GrB/private/gb_power.m +++ b/GraphBLAS/GraphBLAS/@GrB/private/gb_power.m @@ -92,6 +92,6 @@ % convert C to real if imaginary part is zero if (~c_is_real) - C = gb_check_imag_zero (C) ; + C = gb_make_real (C) ; end diff --git a/GraphBLAS/GraphBLAS/@GrB/private/gbmake.m b/GraphBLAS/GraphBLAS/@GrB/private/gbmake.m index e862613046..e2730e2f24 100644 --- a/GraphBLAS/GraphBLAS/@GrB/private/gbmake.m +++ b/GraphBLAS/GraphBLAS/@GrB/private/gbmake.m @@ -140,7 +140,16 @@ function gbmake (what) object_suffix = '.o' ; end -inc = '-Iutil -I../../../Include -I../../../Source -I../../../Source/Shared -I../../../Source/Template -I../../../Source/Factories ' ; +inc = '-Iutil -I../../../Include -I../../../Source ' ; + inc = [inc '-I../../../Source/include '] ; + inc = [inc '-I../../.. ' ] ; + inc = [inc '-I../../../Source/ij ' ] ; + inc = [inc '-I../../../Source/math ' ] ; + inc = [inc '-I../../../Source/cast ' ] ; + inc = [inc '-I../../../Source/binaryop ' ] ; + inc = [inc '-I../../../Source/transpose ' ] ; + inc = [inc '-I../../../Source/helper ' ] ; + inc = [inc '-I../../../Source/builtin ' ] ; if (need_rename) % use the renamed library for MATLAB diff --git a/GraphBLAS/GraphBLAS/@GrB/sqrt.m b/GraphBLAS/GraphBLAS/@GrB/sqrt.m index 8046bf02af..c0490161f3 100644 --- a/GraphBLAS/GraphBLAS/@GrB/sqrt.m +++ b/GraphBLAS/GraphBLAS/@GrB/sqrt.m @@ -8,5 +8,5 @@ % SPDX-License-Identifier: Apache-2.0 G = G.opaque ; -C = GrB (gb_check_imag_zero (gb_trig ('sqrt', G))) ; +C = GrB (gb_make_real (gb_trig ('sqrt', G))) ; diff --git a/GraphBLAS/GraphBLAS/CMakeLists.txt b/GraphBLAS/GraphBLAS/CMakeLists.txt index 2ac95ae73f..9d4982d518 100644 --- a/GraphBLAS/GraphBLAS/CMakeLists.txt +++ b/GraphBLAS/GraphBLAS/CMakeLists.txt @@ -143,17 +143,36 @@ message ( STATUS "CMAKE have OpenMP: ${OpenMP_C_FOUND}" ) set ( CMAKE_INCLUDE_CURRENT_DIR ON ) -if ( GRAPHBLAS_COMPACT ) - # do not compile the FactoryKernels - include_directories ( ../Source/Template ../Source ../Include rename - ../Source/Shared Config ../Source/JitKernels ../JITpackage - ../lz4 ../zstd ../zstd/zstd_subset ../xxHash ../Source/Factories ) -else ( ) - include_directories ( ../Source/Template ../Source ../Include rename - ../Source/Shared Config ../Source/JitKernels ../JITpackage - ../Source/FactoryKernels - ../lz4 ../zstd ../zstd/zstd_subset ../xxHash ../Source/Factories ) -endif ( ) +include_directories ( ${PROJECT_SOURCE_DIR}/../ ../Source ../Include Config + ../xxHash ../lz4 ../zstd ../zstd/zstd_subset ../JITpackage + rename + # include all Source/* folders that have include/ or template/ subfolders: + ../Source/apply + ../Source/assign + ../Source/builder + ../Source/builtin + ../Source/callback + ../Source/concat + ../Source/convert + ../Source/ewise + ../Source/hyper + ../Source/jit_kernels + ../Source/math + ../Source/memory + ../Source/monoid + ../Source/mxm + ../Source/ok + ../Source/omp + ../Source/print + ../Source/reduce + ../Source/select + ../Source/split + ../Source/slice + ../Source/transpose + ../Source/type + ../Source/wait + ../Source/werk + ) #------------------------------------------------------------------------------- # compiler options: @@ -165,28 +184,19 @@ include ( GraphBLAS_compiler_options ) # dynamic graphblas_matlab library properties #------------------------------------------------------------------------------- +file ( GLOB GRAPHBLAS_SOURCES "../PreJIT/*.c" "../Config/*.c" + "../Source/*/*.c" ) + +if ( NOT GRAPHBLAS_COMPACT ) + # compile the FactoryKernels + file ( GLOB GRAPHBLAS_FACTORYKERNELS "../FactoryKernels/*.c" ) + list ( APPEND GRAPHBLAS_SOURCES ${GRAPHBLAS_FACTORYKERNELS} ) +endif ( ) + if ( GRAPHBLAS_USE_JIT ) - if ( GRAPHBLAS_COMPACT ) - # with the JIT; but do not compile the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "../Source/*.c" - "../PreJIT/*.c" "../Config/GB_prejit.c" "../JITpackage/*.c" ) - else ( ) - # with the JIT and the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "../Source/*.c" - "../PreJIT/*.c" "../Config/GB_prejit.c" "../JITpackage/*.c" - "../Source/FactoryKernels/*.c" ) - endif ( ) -else ( ) - if ( GRAPHBLAS_COMPACT ) - # no JIT, do not compile the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "../Source/*.c" - "../PreJIT/*.c" "../Config/GB_prejit.c" ) - else ( ) - # no JIT, but do compile the FactoryKernels - file ( GLOB GRAPHBLAS_SOURCES "../Source/*.c" - "../PreJIT/*.c" "../Config/GB_prejit.c" - "../Source/FactoryKernels/*.c" ) - endif ( ) + # add the JITpackage source + file ( GLOB GRAPHBLAS_JITPACKAGE_SOURCE "../JITpackage/*.c" ) + list ( PREPEND GRAPHBLAS_SOURCES ${GRAPHBLAS_JITPACKAGE_SOURCE} ) endif ( ) add_library ( graphblas_matlab SHARED ${GRAPHBLAS_SOURCES} ) diff --git a/GraphBLAS/GraphBLAS/README.md b/GraphBLAS/GraphBLAS/README.md index 83fc5ba2f4..e44ecb8406 100644 --- a/GraphBLAS/GraphBLAS/README.md +++ b/GraphBLAS/GraphBLAS/README.md @@ -1,6 +1,6 @@ # GraphBLAS/GraphBLAS: MATLAB/Octave interface for SuiteSparse:GraphBLAS -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. SPDX-License-Identifier: Apache-2.0 The @GrB class provides an easy-to-use interface to SuiteSparse:GraphBLAS. @@ -8,12 +8,7 @@ The @GrB class provides an easy-to-use interface to SuiteSparse:GraphBLAS. To install it for use in MATLAB/Octave, first compile the GraphBLAS library, -lgraphblas (for Octave) or -lgraphblas_matlab (for MATLAB). See the instructions in the top-level GraphBLAS folder for details. Be sure to use -OpenMP for best performance. The default installation process places the -GraphBLAS library in /usr/local/lib. If you do not have root access and cannot -install GraphBLAS into /usr/local/lib, then follow the instructions below to -modify your library path, but instead of /usr/local/lib, use -/home/me/SuiteSparse/GraphBLAS/build, where "/home/me/SuiteSparse/GraphBLAS" is -where you placed your copy of GraphBLAS. +OpenMP for best performance. MATLAB (not Octave) the gbmake script will link against the library -lgraphblas_matlab, not -lgraphblas, because that version of MATLAB includes @@ -21,29 +16,6 @@ its own version of SuiteSparse:GraphBLAS (v3.3.3, an earlier one). To avoid a name conflict, you must compile the -lgraphblas_matlab library in /home/me/SuiteSparse/GraphBLAS/GraphBLAS/build. -MATLAB/Octave needs to know where to find the compiled GraphBLAS library. On -Linux/Unix, if you are using the bash or korn shells, make sure that add the -following to your login profile (typically .bash_profile for bash, or .profile -for korn): - - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib - export LD_LIBRARY_PATH - -On Linux/Unix with the csh, tcsh or related shells, use: - - setenv PATH $PATH\:/usr/local/lib - -On the Mac, use the following: - - DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib - export DYLD_LIBRARY_PATH - -If you don't have system priveledges to change /usr/local/lib, then add the -build folder to your LD_LIBRARY_PATH instead, either. For Octave, use -/home/me/SuiteSparse/GraphBLAS/build for libgraphblas.so, -For MATLAB, use: /home/me/SuiteSparse/GraphBLAS/GraphBLAS/build for -libgraphblas_matlab.so. - On Windows 10, on the Search bar type env and hit enter; (or you can right-click My Computer or This PC and select Properties, and then select Advanced System Settings). Select "Edit the system environment variables", diff --git a/GraphBLAS/GraphBLAS/rename/GB_rename.h b/GraphBLAS/GraphBLAS/rename/GB_rename.h index d3362f4ee5..2767635b09 100644 --- a/GraphBLAS/GraphBLAS/rename/GB_rename.h +++ b/GraphBLAS/GraphBLAS/rename/GB_rename.h @@ -7,6 +7,7 @@ #define GB_add_phase2 GM_add_phase2 #define GB_add_sparsity GM_add_sparsity #define GB_all_aliased GM_all_aliased +#define GB_all_entries_are_iso GM_all_entries_are_iso #define GB_any_aliased GM_any_aliased #define GB_apply_bind1st_jit GM_apply_bind1st_jit #define GB_apply_bind2nd_jit GM_apply_bind2nd_jit @@ -206,7 +207,6 @@ #define GB_cexpm1 GM_cexpm1 #define GB_cfloorf GM_cfloorf #define GB_cfloor GM_cfloor -#define GB_check_if_iso GM_check_if_iso #define GB_cisfinitef GM_cisfinitef #define GB_cisfinite GM_cisfinite #define GB_cisinff GM_cisinff @@ -520,6 +520,26 @@ #define GB_is_diagonal GM_is_diagonal #define GB_is_shallow GM_is_shallow #define GB_ix_realloc GM_ix_realloc +#define GB_jit__add__1002e0e0eee00__wildtype GM_jit__add__1002e0e0eee00__wildtype +#define GB_jit__add__1002e0e0eee00__wildtype_query GM_jit__add__1002e0e0eee00__wildtype_query +#define GB_jit__apply_unop__0000db0dbe__fx64_cmplx_imag GM_jit__apply_unop__0000db0dbe__fx64_cmplx_imag +#define GB_jit__apply_unop__0000db0dbe__fx64_cmplx_imag_query GM_jit__apply_unop__0000db0dbe__fx64_cmplx_imag_query +#define GB_jit__apply_unop__0000db0dbe__fx64_cmplx_real GM_jit__apply_unop__0000db0dbe__fx64_cmplx_real +#define GB_jit__apply_unop__0000db0dbe__fx64_cmplx_real_query GM_jit__apply_unop__0000db0dbe__fx64_cmplx_real_query +#define GB_jit__AxB_dot4__03fe900eee0eeec5__addgauss_multgauss GM_jit__AxB_dot4__03fe900eee0eeec5__addgauss_multgauss +#define GB_jit__AxB_dot4__03fe900eee0eeec5__addgauss_multgauss_query GM_jit__AxB_dot4__03fe900eee0eeec5__addgauss_multgauss_query +#define GB_jit__AxB_saxbit__03fe100eee0eee8a__addgauss_multgauss GM_jit__AxB_saxbit__03fe100eee0eee8a__addgauss_multgauss +#define GB_jit__AxB_saxbit__03fe100eee0eee8a__addgauss_multgauss_query GM_jit__AxB_saxbit__03fe100eee0eee8a__addgauss_multgauss_query +#define GB_jit__AxB_saxbit__03fe100eee0eee8a__mycx_plus_mycx_times GM_jit__AxB_saxbit__03fe100eee0eee8a__mycx_plus_mycx_times +#define GB_jit__AxB_saxbit__03fe100eee0eee8a__mycx_plus_mycx_times_query GM_jit__AxB_saxbit__03fe100eee0eee8a__mycx_plus_mycx_times_query +#define GB_jit__AxB_saxpy3__03fe100eee0eee45__wildadd_wildmult GM_jit__AxB_saxpy3__03fe100eee0eee45__wildadd_wildmult +#define GB_jit__AxB_saxpy3__03fe100eee0eee45__wildadd_wildmult_query GM_jit__AxB_saxpy3__03fe100eee0eee45__wildadd_wildmult_query +#define GB_jit__AxB_saxpy4__03fe300eee0eeec7__addgauss_multgauss GM_jit__AxB_saxpy4__03fe300eee0eeec7__addgauss_multgauss +#define GB_jit__AxB_saxpy4__03fe300eee0eeec7__addgauss_multgauss_query GM_jit__AxB_saxpy4__03fe300eee0eeec7__addgauss_multgauss_query +#define GB_jit__AxB_saxpy5__03fe500eee0eeecd__addgauss_multgauss GM_jit__AxB_saxpy5__03fe500eee0eeecd__addgauss_multgauss +#define GB_jit__AxB_saxpy5__03fe500eee0eeecd__addgauss_multgauss_query GM_jit__AxB_saxpy5__03fe500eee0eeecd__addgauss_multgauss_query +#define GB_jit__build__02eeeee__wildtype GM_jit__build__02eeeee__wildtype +#define GB_jit__build__02eeeee__wildtype_query GM_jit__build__02eeeee__wildtype_query #define GB_jitifyer_alloc_space GM_jitifyer_alloc_space #define GB_jitifyer_cmake_compile GM_jitifyer_cmake_compile #define GB_jitifyer_direct_compile GM_jitifyer_direct_compile @@ -542,12 +562,14 @@ #define GB_jitifyer_hash GM_jitifyer_hash #define GB_jitifyer_init GM_jitifyer_init #define GB_jitifyer_insert GM_jitifyer_insert +#define GB_jitifyer_load2_worker GM_jitifyer_load2_worker #define GB_jitifyer_load GM_jitifyer_load #define GB_jitifyer_load_worker GM_jitifyer_load_worker #define GB_jitifyer_lookup GM_jitifyer_lookup #define GB_jitifyer_nvcc_compile GM_jitifyer_nvcc_compile #define GB_jitifyer_path_256 GM_jitifyer_path_256 #define GB_jitifyer_query GM_jitifyer_query +#define GB_jitifyer_sanitize GM_jitifyer_sanitize #define GB_jitifyer_set_cache_path GM_jitifyer_set_cache_path #define GB_jitifyer_set_cache_path_worker GM_jitifyer_set_cache_path_worker #define GB_jitifyer_set_C_cmake_libs GM_jitifyer_set_C_cmake_libs @@ -569,7 +591,6 @@ #define GB_jitifyer_set_error_log_worker GM_jitifyer_set_error_log_worker #define GB_jitifyer_set_use_cmake GM_jitifyer_set_use_cmake #define GB_jitifyer_table_free GM_jitifyer_table_free -#define GB_jitifyer_worker GM_jitifyer_worker #define GB_JITpackage_0 GM_JITpackage_0 #define GB_JITpackage_100 GM_JITpackage_100 #define GB_JITpackage_101 GM_JITpackage_101 @@ -721,7 +742,13 @@ #define GB_JITpackage_233 GM_JITpackage_233 #define GB_JITpackage_234 GM_JITpackage_234 #define GB_JITpackage_235 GM_JITpackage_235 +#define GB_JITpackage_236 GM_JITpackage_236 +#define GB_JITpackage_237 GM_JITpackage_237 +#define GB_JITpackage_238 GM_JITpackage_238 +#define GB_JITpackage_239 GM_JITpackage_239 #define GB_JITpackage_23 GM_JITpackage_23 +#define GB_JITpackage_240 GM_JITpackage_240 +#define GB_JITpackage_241 GM_JITpackage_241 #define GB_JITpackage_24 GM_JITpackage_24 #define GB_JITpackage_25 GM_JITpackage_25 #define GB_JITpackage_26 GM_JITpackage_26 @@ -808,6 +835,26 @@ #define GB_JITpackage_9 GM_JITpackage_9 #define GB_JITpackage_index GM_JITpackage_index #define GB_JITpackage_nfiles GM_JITpackage_nfiles +#define GB_jit__subassign_22__1000eee0eec8__addgauss GM_jit__subassign_22__1000eee0eec8__addgauss +#define GB_jit__subassign_22__1000eee0eec8__addgauss_query GM_jit__subassign_22__1000eee0eec8__addgauss_query +#define GB_jit__subassign_22__1000eee0eec8__multgauss GM_jit__subassign_22__1000eee0eec8__multgauss +#define GB_jit__subassign_22__1000eee0eec8__multgauss_query GM_jit__subassign_22__1000eee0eec8__multgauss_query +#define GB_jit__trans_bind1st__0000eee0efe41__multgauss GM_jit__trans_bind1st__0000eee0efe41__multgauss +#define GB_jit__trans_bind1st__0000eee0efe41__multgauss_query GM_jit__trans_bind1st__0000eee0efe41__multgauss_query +#define GB_jit__trans_bind2nd__0000eee0eef44__multgauss GM_jit__trans_bind2nd__0000eee0eef44__multgauss +#define GB_jit__trans_bind2nd__0000eee0eef44__multgauss_query GM_jit__trans_bind2nd__0000eee0eef44__multgauss_query +#define GB_jit__trans_unop__08006e06ef__realgauss GM_jit__trans_unop__08006e06ef__realgauss +#define GB_jit__trans_unop__08006e06ef__realgauss_query GM_jit__trans_unop__08006e06ef__realgauss_query +#define GB_jit__trans_unop__0802ee0ee5__gauss GM_jit__trans_unop__0802ee0ee5__gauss +#define GB_jit__trans_unop__0802ee0ee5__gauss_query GM_jit__trans_unop__0802ee0ee5__gauss_query +#define GB_jit__trans_unop__0802ee0ee5__wildtype GM_jit__trans_unop__0802ee0ee5__wildtype +#define GB_jit__trans_unop__0802ee0ee5__wildtype_query GM_jit__trans_unop__0802ee0ee5__wildtype_query +#define GB_jit__trans_unop__0802ee0eef__gauss GM_jit__trans_unop__0802ee0eef__gauss +#define GB_jit__trans_unop__0802ee0eef__gauss_query GM_jit__trans_unop__0802ee0eef__gauss_query +#define GB_jit__user_op__0__addgauss GM_jit__user_op__0__addgauss +#define GB_jit__user_op__0__addgauss_query GM_jit__user_op__0__addgauss_query +#define GB_jit__user_type__0__gauss GM_jit__user_type__0__gauss +#define GB_jit__user_type__0__gauss_query GM_jit__user_type__0__gauss_query #define GB_kroner GM_kroner #define GB_kron GM_kron #define GB_LZ4_attach_dictionary GM_LZ4_attach_dictionary diff --git a/GraphBLAS/GraphBLAS/rename/Makefile b/GraphBLAS/GraphBLAS/rename/Makefile index 0b0f25624f..9d9be39525 100644 --- a/GraphBLAS/GraphBLAS/rename/Makefile +++ b/GraphBLAS/GraphBLAS/rename/Makefile @@ -8,23 +8,21 @@ #------------------------------------------------------------------------------- # Linux is required, but the result (GB_rename.h) is then used for all -# platforms. This Makefile onstructs the GB_rename.h file from the compiled +# platforms. This Makefile constructs the GB_rename.h file from the compiled # ../../build/libgraphblas.so, which is then used to compile # libgraphblas_matlab.so with renamed symbols, to avoid conflicting with the # built-in libmwgraphblas.so (v3.3.3) in MATLAB R2021a and later. # GxB_*Iterator* methods are #define'd as both macros and functions in -# GraphBLAS.h, so they are not renamed. Functions with "__" in their name are -# renamed using macros internally, and so they do not need to be renamed with -# GB_rename.h. +# GraphBLAS.h, so they are not renamed. Functions with "GB__" in their name +# are renamed using macros internally, and so they do not need to be renamed +# with GB_rename.h. go: - nm -gD ../../build/libgraphblas.so | grep -v "__" > lib + nm -gD ../../build/libgraphblas.so | grep -v "GB__" > lib grep " GrB_" lib > temp.h - grep " GxB_" lib \ - | grep -v Iterator >> temp.h - grep " GB_" lib \ - | grep -v Iterator >> temp.h + grep " GxB_" lib | grep -v Iterator >> temp.h + grep " GB_" lib | grep -v Iterator >> temp.h awk -f rename.awk < temp.h > temp2.h echo "#define GB_complex GM_complex" >> temp2.h echo "#define GB_complexf GM_complexf" >> temp2.h @@ -33,12 +31,10 @@ go: # on the Mac, use "make mac" mac: - nm -gA ../../build/libgraphblas.dylib | grep -v "__" > lib + nm -gA ../../build/libgraphblas.dylib | grep -v "GB__" > lib grep " _GrB_" lib > temp.h - grep " _GxB_" lib \ - | grep -v Iterator >> temp.h - grep " _GB_" lib \ - | grep -v Iterator >> temp.h + grep " _GxB_" lib | grep -v Iterator >> temp.h + grep " _GB_" lib | grep -v Iterator >> temp.h awk -f rename.awk < temp.h | sort > GB_rename.h rm temp.h lib diff --git a/GraphBLAS/GraphBLAS/test/tcov/gbcovmake.m b/GraphBLAS/GraphBLAS/test/tcov/gbcovmake.m index d78642cc2b..b746ff598d 100644 --- a/GraphBLAS/GraphBLAS/test/tcov/gbcovmake.m +++ b/GraphBLAS/GraphBLAS/test/tcov/gbcovmake.m @@ -86,14 +86,13 @@ libraries = '-L../../../../../../build -L. -L/usr/local/lib -lgraphblas' ; end - if (~ismac && isunix) flags = [ flags ' CFLAGS="$CXXFLAGS -fopenmp -fPIC -Wno-pragmas" '] ; flags = [ flags ' CXXFLAGS="$CXXFLAGS -fopenmp -fPIC -Wno-pragmas" '] ; flags = [ flags ' LDFLAGS="$LDFLAGS -fopenmp -fPIC" '] ; end -inc = [ inc '-I. -I../util -I../../../../../../Include -I../../../../../../Source -I../../../../../../Source/Template -I../../../../../../cpu_features/include ' ] ; +inc = [ inc '-I. -I../util -I../../../../../../Include -I../../../../../../Source -I../../../../../../Source/include -I../../../../../../cpu_features/include ' ] ; cd tmp/@GrB/private try diff --git a/GraphBLAS/Include/GraphBLAS.h b/GraphBLAS/Include/GraphBLAS.h index 150bf3d07b..2d07b926e1 100644 --- a/GraphBLAS/Include/GraphBLAS.h +++ b/GraphBLAS/Include/GraphBLAS.h @@ -1,4 +1,4 @@ -// SuiteSparse:GraphBLAS 9.2.0 +// SuiteSparse:GraphBLAS 9.3.0 //------------------------------------------------------------------------------ // GraphBLAS.h: definitions for the GraphBLAS package //------------------------------------------------------------------------------ @@ -254,9 +254,9 @@ // The version of this implementation, and the GraphBLAS API version: #define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS" -#define GxB_IMPLEMENTATION_DATE "May 22, 2024" +#define GxB_IMPLEMENTATION_DATE "June 1, 2024" #define GxB_IMPLEMENTATION_MAJOR 9 -#define GxB_IMPLEMENTATION_MINOR 2 +#define GxB_IMPLEMENTATION_MINOR 3 #define GxB_IMPLEMENTATION_SUB 0 #define GxB_SPEC_DATE "Dec 22, 2023" #define GxB_SPEC_MAJOR 2 @@ -7116,7 +7116,7 @@ GrB_Info GrB_Vector_apply_BinaryOp1st_Scalar // w = accum (w, op(x,u)) const GrB_Descriptor desc // descriptor for w and mask ) ; -// historical: identical to GxB_Vector_apply_BinaryOp1st +// historical: identical to GrB_Vector_apply_BinaryOp1st_Scalar GrB_Info GxB_Vector_apply_BinaryOp1st // w = accum (w, op(x,u)) ( GrB_Vector w, // input/output vector for results diff --git a/GraphBLAS/JITpackage/CMakeLists.txt b/GraphBLAS/JITpackage/CMakeLists.txt index 3d3dab7563..d31cd51b49 100644 --- a/GraphBLAS/JITpackage/CMakeLists.txt +++ b/GraphBLAS/JITpackage/CMakeLists.txt @@ -76,11 +76,11 @@ if ( TARGET grb_jitpackage ) file ( GLOB GRB_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../Include/GraphBLAS.h" - "../Source/Template/*.[ch]" - "../Source/JitKernels/*.[ch]" - "../CUDA/Template/*" - "../CUDA/JitKernels/*" - "../Source/Shared/*.h" ) + "../CUDA/template/*" + "../CUDA/include/*" + "../Source/*/template/*" + "../Source/*/include/*" + "../Source/include/*" ) add_custom_command ( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/GB_JITpackage.c COMMAND $ diff --git a/GraphBLAS/JITpackage/Source/grb_jitpackage.c b/GraphBLAS/JITpackage/Source/grb_jitpackage.c index 429c53f08f..992a92d2eb 100644 --- a/GraphBLAS/JITpackage/Source/grb_jitpackage.c +++ b/GraphBLAS/JITpackage/Source/grb_jitpackage.c @@ -10,6 +10,7 @@ #include #include #include +#include //------------------------------------------------------------------------------ // zstd.h include file @@ -72,6 +73,36 @@ #include "zstd_subset/decompress/zstd_decompress.c" */ +//------------------------------------------------------------------------------ +// match_prefix: return true if the input string matches the prefix +//------------------------------------------------------------------------------ + +bool match_prefix (char *string, char *prefix) ; + +bool match_prefix (char *string, char *prefix) +{ + char *s = string ; + char *p = prefix ; + while (*s && *p) + { + if (*s != *p) + { + // both the string and prefix character are present, but + // do not match + return (false) ; + } + s++ ; + p++ ; + if (*p == '\0') + { + // the prefix is exhausted, so it has been found as the first part + // of the string + return (true) ; + } + } + return (false) ; +} + //------------------------------------------------------------------------------ // grb_prepackage main program //------------------------------------------------------------------------------ @@ -192,18 +223,27 @@ int main (int argc, char **argv) nfiles) ; for (int k = 1 ; k < argc ; k++) { - // get the filename (without the path) - char *name = argv [k] ; - for (char *p = argv [k] ; *p != '\0' ; p++) + // get the filename + char *fullname = argv [k] ; + char *filename = fullname ; + int len = (int) strlen (fullname) ; +// for (char *p = argv [k] ; *p != '\0' ; p++) + + for (int i = 0 ; i < len ; i++) { - if (*p == '/') + if (fullname [i] == '/') { - name = p + 1 ; + filename = fullname + i + 1 ; + if (match_prefix (filename, "template") || + match_prefix (filename, "include")) + { + break ; + } } } // append this file to the index fprintf (fp, " { %8zu, %8zu, GB_JITpackage_%-3d, \"%s\" },\n", - Uncompressed_size [k], Compressed_size [k], k-1, name) ; + Uncompressed_size [k], Compressed_size [k], k-1, filename) ; } fprintf (fp, "} ;\n#endif\n\n") ; fclose (fp) ; diff --git a/GraphBLAS/README.md b/GraphBLAS/README.md index ba2076d59e..2488900016 100644 --- a/GraphBLAS/README.md +++ b/GraphBLAS/README.md @@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. SPDX-License-Identifier: Apache-2.0 -VERSION 9.2.0, May 22, 2024 +VERSION 9.3.0, June 1, 2024 SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard, which defines a set of sparse matrix operations on an extended algebra of diff --git a/GraphBLAS/Source/GB.h b/GraphBLAS/Source/GB.h index 1ee458b44f..1cfe63524a 100644 --- a/GraphBLAS/Source/GB.h +++ b/GraphBLAS/Source/GB.h @@ -10,52 +10,49 @@ #ifndef GB_H #define GB_H -#include "GB_Template.h" -#include "GB_Global.h" -#include "GB_printf.h" -#include "GB_assert.h" +#include "include/GB_include.h" +#include "global/GB_Global.h" +#include "print/GB_printf.h" +#include "ok/GB_assert.h" #if defined ( GRAPHBLAS_HAS_CUDA ) #include "rmm_wrap.h" #endif -#include "GB_static_header.h" -#include "GB_positional.h" -#include "GB_bitwise.h" -#include "GB_check.h" -#include "GB_nnz.h" -#include "GB_omp.h" -#include "GB_memory.h" -#include "GB_iso.h" -#include "GB_Pending_n.h" -#include "GB_nvals.h" -#include "GB_aliased.h" -#include "GB_new.h" -#include "GB_clear.h" -#include "GB_resize.h" -#include "GB_dup.h" -#include "GB_code_compatible.h" -#include "GB_compatible.h" -#include "GB_task_methods.h" -#include "GB_transplant.h" -#include "GB_type.h" -#include "GB_slice.h" -#include "GB_uint64_multiply.h" -#include "GB_int64_multiply.h" -#include "GB_size_t_multiply.h" -#include "GB_extractTuples.h" -#include "GB_cumsum.h" -#include "GB_Descriptor_get.h" -#include "GB_Element.h" -#include "GB_op.h" -#include "GB_hyper.h" -#include "GB_ok.h" -#include "GB_cast.h" -#include "GB_wait.h" -#include "GB_convert.h" -#include "GB_where.h" -#include "GB_Context.h" -#include "GB_cuda_gateway.h" -#include "GB_saxpy3task_struct.h" -#include "GB_callbacks.h" -#include "GB_factory.h" +#include "matrix/GB_static_header.h" +#include "positional/GB_positional.h" +#include "math/GB_bitwise.h" +#include "print/GB_check.h" +#include "nvals/GB_nnz.h" +#include "omp/GB_omp.h" +#include "memory/GB_memory.h" +#include "iso/GB_iso.h" +#include "pending/GB_Pending_n.h" +#include "nvals/GB_nvals.h" +#include "aliased/GB_aliased.h" +#include "matrix/GB_new.h" +#include "clear/GB_clear.h" +#include "dup/GB_dup.h" +#include "compatible/GB_code_compatible.h" +#include "compatible/GB_compatible.h" +#include "slice/GB_task_methods.h" +#include "transplant/GB_transplant.h" +#include "type/GB_type.h" +#include "slice/GB_slice.h" +#include "math/GB_uint64_multiply.h" +#include "math/GB_int64_multiply.h" +#include "math/GB_size_t_multiply.h" +#include "cumsum/GB_cumsum.h" +#include "get_set/GB_Descriptor_get.h" +#include "element/GB_Element.h" +#include "op/GB_op.h" +#include "hyper/GB_hyper.h" +#include "ok/GB_ok.h" +#include "cast/GB_cast.h" +#include "wait/GB_wait.h" +#include "convert/GB_convert.h" +#include "werk/GB_where.h" +#include "context/GB_Context.h" +#include "gateway/GB_cuda_gateway.h" +#include "callback/GB_callbacks.h" +#include "helper/GB_factory.h" #endif diff --git a/GraphBLAS/Source/GB_AxB_kernels.h b/GraphBLAS/Source/GB_AxB_kernels.h deleted file mode 100644 index eb898dbe35..0000000000 --- a/GraphBLAS/Source/GB_AxB_kernels.h +++ /dev/null @@ -1,14 +0,0 @@ -//------------------------------------------------------------------------------ -// GB_AxB_kernels.h: include files for FactoryKernels -//------------------------------------------------------------------------------ - -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -//------------------------------------------------------------------------------ - -#include "GB_sort.h" -#include "GB_AxB_saxpy.h" -#include "GB_unused.h" -#include "GB_bitmap_assign_methods.h" - diff --git a/GraphBLAS/Source/GB_control.h b/GraphBLAS/Source/GB_control.h index 31fd19c9c7..873a064416 100644 --- a/GraphBLAS/Source/GB_control.h +++ b/GraphBLAS/Source/GB_control.h @@ -16,7 +16,7 @@ // The installer of SuiteSparse:GraphBLAS can edit this file to reduce the code // size of the compiled library, by seletively disabling the corresponding -// hard-coded functions in Source/FactoryKernels. For example, if +// hard-coded functions in FactoryKernels. For example, if // SuiteSparse:GraphBLAS is integrated into an application that makes no use of // the GrB_INT16 data type, or just occassional use where performance is not a // concern, then uncomment the line "#define GxB_NO_INT16 1". Alternatively, diff --git a/GraphBLAS/Source/GB_ewise_kernels.h b/GraphBLAS/Source/GB_ewise_kernels.h deleted file mode 100644 index b90a8a4f65..0000000000 --- a/GraphBLAS/Source/GB_ewise_kernels.h +++ /dev/null @@ -1,13 +0,0 @@ -//------------------------------------------------------------------------------ -// GB_ewise_kernels.h: include files for Factory kernels -//------------------------------------------------------------------------------ - -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -//------------------------------------------------------------------------------ - -#include "GB_emult.h" -#include "GB_ek_slice.h" -#include "GB_bitmap_assign_methods.h" - diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_reduce.c b/GraphBLAS/Source/JitKernels/GB_jit_kernel_reduce.c deleted file mode 100644 index 8ba7b59d82..0000000000 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_reduce.c +++ /dev/null @@ -1,96 +0,0 @@ -//------------------------------------------------------------------------------ -// GB_jit_kernel_reduce.c: JIT kernel for reduction to scalar -//------------------------------------------------------------------------------ - -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -//------------------------------------------------------------------------------ - -// The GB_jitifyer constructs a *.c file with macro definitions specific to the -// problem instance, such as the excerpts for the GB_jit_reduce_2c1fbb2 kernel, -// below, which a kernel that computes the scalar reduce of a double matrix in -// bitmap form, using the GrB_PLUS_FP64_MONOID. The code 2c1fbb2 is computed -// by GB_enumify_reduce. The macros are followed by an #include with this -// file, to define the kernel routine itself. The kernel is always called -// GB_jit_kernel, regardless of what it computes. - -#ifdef for_comments_only // only so vim will add color to the code below: - - // example file: GB_jit_reduce_2c1fbb2.c - - #include "GB_jit_kernel_reduce.h" - - // reduce: (plus, double) - - // monoid: - #define GB_Z_TYPE double - #define GB_ADD(z,x,y) z = (x) + (y) - #define GB_UPDATE(z,y) z += y - #define GB_DECLARE_IDENTITY(z) double z = 0 - #define GB_DECLARE_IDENTITY_CONST(z) const double z = 0 - #define GB_HAS_IDENTITY_BYTE 1 - #define GB_IDENTITY_BYTE 0x00 - #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) - #define GB_Z_IGNORE_OVERFLOW 1 - #define GB_Z_NBITS 64 - #define GB_Z_ATOMIC_BITS 64 - #define GB_Z_HAS_ATOMIC_UPDATE 1 - #define GB_Z_HAS_OMP_ATOMIC_UPDATE 1 - #define GB_Z_HAS_CUDA_ATOMIC_BUILTIN 1 - #define GB_Z_CUDA_ATOMIC GB_cuda_atomic_add - #define GB_Z_CUDA_ATOMIC_TYPE double - #define GB_GETA_AND_UPDATE(z,Ax,p) GB_UPDATE (z, Ax [p]) - - // A matrix: bitmap - #define GB_A_IS_HYPER 0 - #define GB_A_IS_SPARSE 0 - #define GB_A_IS_BITMAP 1 - #define GB_A_IS_FULL 0 - #define GBP_A(Ap,k,vlen) ((k) * (vlen)) - #define GBH_A(Ah,k) (k) - #define GBI_A(Ai,p,vlen) ((p) % (vlen)) - #define GBB_A(Ab,p) Ab [p] - #define GB_A_ISO 0 - #define GB_A_HAS_ZOMBIES 0 - #define GB_A_TYPE double - #define GB_A2TYPE double - #define GB_DECLAREA(a) double a - #define GB_GETA(a,Ax,p,iso) a = Ax [p] - - // panel size for reduction: - #define GB_PANEL 32 - - #include "GB_monoid_shared_definitions.h" - - #include "GB_jit_kernel_reduce.c" - -#endif - -//------------------------------------------------------------------------------ -// reduce to a non-iso matrix to scalar, for monoids only -//------------------------------------------------------------------------------ - -// The two template files GB_reduce_to_scalar_template.c and GB_reduce_panel.c -// appear in GraphBLAS/Source/Template. They are used by both the pre-compiled -// kernels in GraphBLAS/Source/FactoryKernels, and by the JIT kernel here. - -GB_JIT_GLOBAL GB_JIT_KERNEL_REDUCE_PROTO (GB_jit_kernel) ; -GB_JIT_GLOBAL GB_JIT_KERNEL_REDUCE_PROTO (GB_jit_kernel) -{ - GB_Z_TYPE z = (* ((GB_Z_TYPE *) result)) ; - GB_Z_TYPE *W = (GB_Z_TYPE *) Workspace ; - #if GB_A_HAS_ZOMBIES || GB_A_IS_BITMAP || (GB_PANEL == 1) - { - #include "GB_reduce_to_scalar_template.c" - } - #else - { - #include "GB_reduce_panel.c" - } - #endif - // (*result) = z ; - memcpy (result, &z, sizeof (GB_Z_TYPE)) ; - return (GrB_SUCCESS) ; -} - diff --git a/GraphBLAS/Source/README.txt b/GraphBLAS/Source/README.txt index da50af4b12..daa6740c2f 100644 --- a/GraphBLAS/Source/README.txt +++ b/GraphBLAS/Source/README.txt @@ -1,19 +1,192 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. SPDX-License-Identifier: Apache-2.0 This folder, GraphBLAS/Source, contains all the primary source files for -GraphBLAS, an internal include files that are meant for internal -inclusion in GraphBLAS itself. They should not be included in end-user -applications. +GraphBLAS, and internal include files that are meant for internal inclusion in +GraphBLAS itself. They should not be included in end-user applications. -The Template/ files are not compiled separately, but are #include'd into files -in this folder instead. +The Source/*/template/* files are not compiled separately, but are #include'd +into files in this folder instead. The are templatized source files. The +Source/*/include/* files are header files for template methods. Both template +and include files are merged into the JITpackage and then exported to +~/.SuiteSparse/GrB.x.y.z/src. -The FactoryKernel/* files are created by the *.m scripts from the -Generator/* files, and should not be editted. If the Generator/ files are -modified then type: +Source/*/factory/* files are not used in the JIT. - codegen +Files and folders in Source/ -in MATLAB to construct them. +aliased methods for determining if any components of a matrix + are aliased (shared) with another matrix. Such a matrix + is called shallow (an array such as A->i is shallow + if A->i_shallow is true, and is owned by another matrix). + Such matrices are never returned to the user; they are + only internal. + +apply GrB_apply + +assign GrB_assgn and GxB_assign + +binaryop GrB_BinaryOp object + +builder GrB_build + +builtin builtin types, operators, monoids, and semirings + +callback JIT kernels are not linked against -lgraphblas and thus + cannot call back into GraphBLAS directly. Instead, a + struct containing function pointers to various utility + functions is passed to each JIT kernel. + +cast typecasting + +clear GrB_clear + +codegen MATLAB scripts for creating ../FactoryKernels, + Source/mxm/GB_AxB__any_pair_iso.c, and + Source/mxm/GB_AxB__include1.h. + +compatible testing if operators and types are compatible (if they can + be typecasted to another type. + +concat GxB_concat + +context GxB_Context object + +convert convert between matrix formats (sparse, hypersparse, bitmap, + and full), and conform a matrix to its desired format. + +cpu wrapper for Google's cpu_featuers package + +cumsum cumulative sum + +descriptor GrB_Descriptor object + +diag GrB_diag and GxB_diag + +dup GrB_dup + +element GrB_setElement, GrB_extractElement, GrB_removeElement + +ewise GrB_eWiseAdd, GrB_eWiseMult, and GxB_eWiseUnion + +extract GrB_extract + +extractTuples GrB_extractTuples + +gateway definitions for calling methods in the CUDA folder + +GB.h primary internal include file + +GB_control.h controls which FactoryKernels are compiled + +generic definitions for generic methods + +get_set GrB_get, GrB_set + +global global variables and the routines for accessing them + +helper methods used in MATLAB/Octave @GrB interface only + +hyper methods for hypersparse matrices + +ij determining properities of I and J index lists for + GrB_extract, GrB_assign, and GxB_subassign + +import_export GrB_import, GrB_export, GxB_import, and GxB_export + +include general-purpose header files that do not fit into any + particular subfolder of GraphBLAS/Source, such as compiler + settings, and GB_include.h which is a primary internal + include file. + +indexunaryop GrB_IndexUnaryOp object + +init GrB_init, GxB_init, GrB_finalize, GrB_error, GrB_getVersion + +iso iso-valued matrices + +iterator GxB_Iterator object and its methods + +jitifyer the GraphBLAS Just-In-Time compiler for CPU and CUDA JIT + kernels + +jit_kernels templates for all CPU JIT kernels. These are not compiled + when the libgraphblas.so library is built. Instead, they + are compiled at run time when requested by the JIT. + +jit_wrappers interfaces that access the JIT to call/load/compile each + CPU JIT kernel + +kronecker GrB_kronecker + +lz4_wrapper wrapper for the lz4 compression package + +mask mask/accum methods, for computing C+=T + +math basic mathematical functions + +matrix GrB_Matrix object + +memory memory allocators (wrappers for malloc, free, etc), + memset, memcpy + +monoid GrB_Monoid object + +mxm GrB_mxm, GrB_vxm, and GrB_mxv + +nvals GrB_nvals + +ok debugging assertions + +omp OpenMP interface and atomics + +op methods for operators (GrB_UnaryOp, GrB_BinaryOp, etc) + +pack_unpack GxB_pack, GxB_unpack + +pending pending tuples for updates to matrices, vectors, and scalars + +positional methods for positional operators + +print GxB_print, GxB_fprint + +README.txt this file + +reduce GrB_reduce, to scalar and vector + +reshape GrB_reshape + +resize GrB_resize + +scalar GrB_Scalar object + +select GrB_select + +semiring GrB_Semiring object + +serialize GrB_serialize, GrB_deserialze + +slice methods for slicing matrices to create parallel tasks + +sort GxB_sort, and internal sorting methods + +split GxB_split + +transplant transplant contents of one matrix into another + +transpose GrB_transpose + +type GrB_Type object + +unaryop GrB_UnaryOp object + +vector GrB_Vector object + +wait GrB_wait + +werk the Werk space is a small amount of space on the stack + use for small things (scalars, O(# parallel OpenMP tasks), + and such. It is spell differently for easier 'grep'. + +zstd_wrapper wrapper for the zstd compression package diff --git a/GraphBLAS/Source/Shared/README.txt b/GraphBLAS/Source/Shared/README.txt deleted file mode 100644 index 0aca405859..0000000000 --- a/GraphBLAS/Source/Shared/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -GraphBLAS/Source/Shared: - -This folder contains all source code that is required by both the primary -GraphBLAS library, and the CUDA kernels. - diff --git a/GraphBLAS/Source/Template/GB_Template.h b/GraphBLAS/Source/Template/GB_Template.h deleted file mode 100644 index 7e6af4c505..0000000000 --- a/GraphBLAS/Source/Template/GB_Template.h +++ /dev/null @@ -1,83 +0,0 @@ -//------------------------------------------------------------------------------ -// GB_Template.h: definitions for Template methods -//------------------------------------------------------------------------------ - -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -//------------------------------------------------------------------------------ - -#ifndef GB_TEMPLATE_H -#define GB_TEMPLATE_H - -//------------------------------------------------------------------------------ -// definitions that modify GraphBLAS.h -//------------------------------------------------------------------------------ - -#include "GB_dev.h" -#include "GB_compiler.h" -#include "GB_warnings.h" -#include "GB_coverage.h" - -//------------------------------------------------------------------------------ -// user-visible GraphBLAS.h -//------------------------------------------------------------------------------ - -#include "GraphBLAS.h" -#undef I - -#ifdef GBMATLAB -#undef GRAPHBLAS_HAS_CUDA -#endif - -//------------------------------------------------------------------------------ -// handle the restrict and 'static inline' keywords -//------------------------------------------------------------------------------ - -// Intentionally shadow the built-in "restrict" keyword. See GraphBLAS.h for -// the definition of GB_restrict. It becomes empty for C++, and "__restrict" -// for MS Visual Studio. Otherwise, GB_restrict is just "restrict" on C11 -// compliant compilers. I prefer to use the "restrict" keyword to make the -// code readable. This #define is a patch for compilers that don't support it: - -#define restrict GB_restrict - -// for internal static inline functions (will be redefined for CUDA) -#undef GB_STATIC_INLINE -#define GB_STATIC_INLINE static inline - -//------------------------------------------------------------------------------ -// internal #include files -//------------------------------------------------------------------------------ - -#include "GB_prefix.h" -#include "GB_bytes.h" -#include "GB_defaults.h" -#include "GB_index.h" -#include "GB_complex.h" -#include "GB_pun.h" -#include "GB_atomics.h" -#include "GB_printf_kernels.h" -#include "GB_assert_kernels.h" -#include "GB_opaque.h" -#include "GB_math_macros.h" -#include "GB_binary_search.h" -#include "GB_zombie.h" -#include "GB_partition.h" -#include "GB_memory_macros.h" -#include "GB_werk.h" -#include "GB_nthreads.h" -#include "GB_log2.h" -#include "GB_task_struct.h" -#include "GB_hash.h" -#include "GB_wait_macros.h" -#include "GB_AxB_macros.h" -#include "GB_ek_slice_kernels.h" -#include "GB_bitmap_scatter.h" -#include "GB_int64_mult.h" -#include "GB_hyper_hash_lookup.h" -#include "GB_omp_kernels.h" -#include "GB_callback.h" - -#endif - diff --git a/GraphBLAS/Source/Template/README.txt b/GraphBLAS/Source/Template/README.txt deleted file mode 100644 index 4b595ebc71..0000000000 --- a/GraphBLAS/Source/Template/README.txt +++ /dev/null @@ -1,15 +0,0 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 - -This is the GraphBLAS/Source/Template folder. - -These files are not stand-alone, but are #include'd in files in Source/*.c, -Source/GB.h, Source/Generator/*.c, Source/FactoryKernels/*.c, and -Source/JitKernels/*.c to generate code. - -Files with the name GB_*_factory.c are "switch factories", where the -#include'ing file #define's a GB_WORKER macro that is then specialized by the -*factory.c code to generate workers for different semirings, types, and -operators. Some of the *factory.c files are two-level, where one *factory.c -file #include's another one from this same folder. - diff --git a/GraphBLAS/Source/GB_aliased.h b/GraphBLAS/Source/aliased/GB_aliased.h similarity index 100% rename from GraphBLAS/Source/GB_aliased.h rename to GraphBLAS/Source/aliased/GB_aliased.h diff --git a/GraphBLAS/Source/GB_all_aliased.c b/GraphBLAS/Source/aliased/GB_all_aliased.c similarity index 100% rename from GraphBLAS/Source/GB_all_aliased.c rename to GraphBLAS/Source/aliased/GB_all_aliased.c diff --git a/GraphBLAS/Source/GB_any_aliased.c b/GraphBLAS/Source/aliased/GB_any_aliased.c similarity index 100% rename from GraphBLAS/Source/GB_any_aliased.c rename to GraphBLAS/Source/aliased/GB_any_aliased.c diff --git a/GraphBLAS/Source/GB_is_shallow.c b/GraphBLAS/Source/aliased/GB_is_shallow.c similarity index 100% rename from GraphBLAS/Source/GB_is_shallow.c rename to GraphBLAS/Source/aliased/GB_is_shallow.c diff --git a/GraphBLAS/Source/GB_apply.c b/GraphBLAS/Source/apply/GB_apply.c similarity index 98% rename from GraphBLAS/Source/GB_apply.c rename to GraphBLAS/Source/apply/GB_apply.c index 9ef07e6967..46c6b7190f 100644 --- a/GraphBLAS/Source/GB_apply.c +++ b/GraphBLAS/Source/apply/GB_apply.c @@ -13,11 +13,11 @@ #define GB_FREE_ALL ; -#include "GB_apply.h" -#include "GB_binop.h" -#include "GB_transpose.h" -#include "GB_accum_mask.h" -#include "GB_scalar_wrap.h" +#include "apply/GB_apply.h" +#include "binaryop/GB_binop.h" +#include "transpose/GB_transpose.h" +#include "mask/GB_accum_mask.h" +#include "scalar/GB_Scalar_wrap.h" GrB_Info GB_apply // C = accum (C, op(A)) or op(A') ( diff --git a/GraphBLAS/Source/GB_apply.h b/GraphBLAS/Source/apply/GB_apply.h similarity index 98% rename from GraphBLAS/Source/GB_apply.h rename to GraphBLAS/Source/apply/GB_apply.h index eb3690e6ad..1727e9f589 100644 --- a/GraphBLAS/Source/GB_apply.h +++ b/GraphBLAS/Source/apply/GB_apply.h @@ -10,7 +10,7 @@ #ifndef GB_APPLY_H #define GB_APPLY_H #include "GB.h" -#include "GB_unop.h" +#include "unaryop/GB_unop.h" GrB_Info GB_apply // C = accum (C, op(A)) or op(A') ( diff --git a/GraphBLAS/Source/GB_apply_op.c b/GraphBLAS/Source/apply/GB_apply_op.c similarity index 88% rename from GraphBLAS/Source/GB_apply_op.c rename to GraphBLAS/Source/apply/GB_apply_op.c index d810f644e1..c186f2d37d 100644 --- a/GraphBLAS/Source/GB_apply_op.c +++ b/GraphBLAS/Source/apply/GB_apply_op.c @@ -17,14 +17,14 @@ // it is in CSC format. The caller has already modified the op if A is in CSR // format. -#include "GB_apply.h" -#include "GB_binop.h" -#include "GB_ek_slice.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "apply/GB_apply.h" +#include "binaryop/GB_binop.h" +#include "slice/GB_ek_slice.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_unop__include.h" -#include "GB_ew__include.h" +#include "FactoryKernels/GB_uop__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_ALL \ @@ -184,7 +184,8 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) #if defined ( GRAPHBLAS_HAS_CUDA ) if (GB_cuda_apply_unop_branch (ctype, A, op)) { - info = GB_cuda_apply_unop (Cx, ctype, op, flipij, A, (GB_void *) &thunk) ; + info = GB_cuda_apply_unop (Cx, ctype, op, flipij, A, + (GB_void *) &thunk) ; } #endif @@ -196,50 +197,50 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) const int64_t *restrict Ai = A->i ; int64_t avlen = A->vlen ; - //---------------------------------------------------------------------- + //------------------------------------------------------------------ // Cx = positional_op (A) - //---------------------------------------------------------------------- + //------------------------------------------------------------------ if (is64) { - //------------------------------------------------------------------ + //-------------------------------------------------------------- // int64 Cx = positional_op (A) - //------------------------------------------------------------------ + //-------------------------------------------------------------- int64_t *restrict Cz = (int64_t *) Cx ; switch (opcode) { - case GB_POSITIONI_unop_code : // z = position_i(A(i,j)) == i - case GB_POSITIONI1_unop_code : // z = position_i1(A(i,j)) == i+1 + case GB_POSITIONI_unop_code : // z = pos_i(A(i,j)) == i + case GB_POSITIONI1_unop_code : // z = pos_i1(A(i,j)) == i+1 case GB_ROWINDEX_idxunop_code : // z = i+thunk #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (i + thunk) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" break ; - case GB_POSITIONJ_unop_code : // z = position_j(A(i,j)) == j - case GB_POSITIONJ1_unop_code : // z = position_j1(A(i,j)) == j+1 + case GB_POSITIONJ_unop_code : // z = pos_j(A(i,j)) == j + case GB_POSITIONJ1_unop_code : // z = pos_j1(A(i,j)) == j+1 case GB_COLINDEX_idxunop_code : // z = j+thunk #define GB_APPLY_OP(p) \ Cz [p] = (j + thunk) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; case GB_DIAGINDEX_idxunop_code : // z = (j-(i+thunk) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (j - (i+thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; case GB_FLIPDIAGINDEX_idxunop_code : // z = (i-(j+thunk) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (i - (j+thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; default: ; @@ -249,43 +250,43 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) else if (is32) { - //------------------------------------------------------------------ + //-------------------------------------------------------------- // int32 Cx = positional_op (A) - //------------------------------------------------------------------ + //-------------------------------------------------------------- int32_t *restrict Cz = (int32_t *) Cx ; switch (opcode) { - case GB_POSITIONI_unop_code : // z = position_i(A(i,j)) == i - case GB_POSITIONI1_unop_code : // z = position_i1(A(i,j)) == i+1 + case GB_POSITIONI_unop_code : // z = pos_i(A(i,j)) == i + case GB_POSITIONI1_unop_code : // z = pos_i1(A(i,j)) == i+1 case GB_ROWINDEX_idxunop_code : // z = i+thunk #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (int32_t) (i + thunk) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" break ; - case GB_POSITIONJ_unop_code : // z = position_j(A(i,j)) == j - case GB_POSITIONJ1_unop_code : // z = position_j1(A(i,j)) == j+1 + case GB_POSITIONJ_unop_code : // z = pos_j(A(i,j)) == j + case GB_POSITIONJ1_unop_code : // z = pos_j1(A(i,j)) == j+1 case GB_COLINDEX_idxunop_code : // z = j+thunk #define GB_APPLY_OP(p) \ Cz [p] = (int32_t) (j + thunk) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; case GB_DIAGINDEX_idxunop_code : // z = (j-(i+thunk) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (int32_t) (j - (i+thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; case GB_FLIPDIAGINDEX_idxunop_code : // z = (i-(j+thunk) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (int32_t) (i - (j+thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; default: ; @@ -295,9 +296,9 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) else { - //------------------------------------------------------------------ + //-------------------------------------------------------------- // bool Cx = positional_op (A) - //------------------------------------------------------------------ + //-------------------------------------------------------------- ASSERT (op->ztype == GrB_BOOL) ; bool *restrict Cz = (bool *) Cx ; @@ -308,54 +309,54 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (j <= (i + thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; ; case GB_TRIU_idxunop_code : // z = (j >= (i+thunk)) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (j >= (i + thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; ; case GB_DIAG_idxunop_code : // z = (j == (i+thunk)) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (j == (i + thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; ; case GB_OFFDIAG_idxunop_code : // z = (j != (i+thunk)) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (j != (i + thunk)) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; ; case GB_COLLE_idxunop_code : // z = (j <= thunk) #define GB_APPLY_OP(p) \ Cz [p] = (j <= thunk) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; ; case GB_COLGT_idxunop_code : // z = (j > thunk) #define GB_APPLY_OP(p) \ Cz [p] = (j > thunk) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" break ; ; case GB_ROWLE_idxunop_code : // z = (i <= thunk) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (i <= thunk) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" break ; ; case GB_ROWGT_idxunop_code : // z = (i > thunk) #define GB_APPLY_OP(p) \ int64_t i = GBI_A (Ai, p, avlen) ; \ Cz [p] = (i > thunk) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" break ; ; default: ; @@ -408,29 +409,29 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) if (Atype == op->xtype || opcode == GB_IDENTITY_unop_code) { - // The switch factory is used if the op is IDENTITY, or if no - // typecasting. IDENTITY operator can do arbitrary typecasting - // (it is not used if no typecasting is done). + // The switch factory is used if the op is IDENTITY, or if + // no typecasting. IDENTITY operator can do arbitrary + // typecasting (it is not used if no typecasting is done). - //-------------------------------------------------------------- + //---------------------------------------------------------- // define the worker for the switch factory - //-------------------------------------------------------------- + //---------------------------------------------------------- - #define GB_unop_apply(unop,zname,aname) \ - GB (_unop_apply_ ## unop ## zname ## aname) + #define GB_uop_apply(unop,zname,aname) \ + GB (_uop_apply_ ## unop ## zname ## aname) - #define GB_WORKER(unop,zname,ztype,aname,atype) \ - { \ - info = GB_unop_apply (unop,zname,aname) (Cx, Ax, Ab, \ - anz, A_nthreads) ; \ - } \ + #define GB_WORKER(unop,zname,ztype,aname,atype) \ + { \ + info = GB_uop_apply (unop,zname,aname) (Cx, Ax, Ab, \ + anz, A_nthreads) ; \ + } \ break ; - //-------------------------------------------------------------- + //---------------------------------------------------------- // launch the switch factory - //-------------------------------------------------------------- + //---------------------------------------------------------- - #include "GB_unop_factory.c" + #include "apply/factory/GB_unop_factory.c" } } } @@ -469,7 +470,7 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) /* Cx [p] = fop (xwork) */ \ fop (Cx +(p*zsize), xwork) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" info = GrB_SUCCESS ; } @@ -536,8 +537,10 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) //------------------------------------------------------------------ #if defined ( GRAPHBLAS_HAS_CUDA ) - if (GB_cuda_apply_binop_branch (ctype, (GrB_BinaryOp) op, A)) { - info = GB_cuda_apply_binop (Cx, ctype, (GrB_BinaryOp) op, A, scalarx, true) ; + if (GB_cuda_apply_binop_branch (ctype, (GrB_BinaryOp) op, A)) + { + info = GB_cuda_apply_binop (Cx, ctype, (GrB_BinaryOp) op, A, + scalarx, true) ; } #endif @@ -547,30 +550,31 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) GB_IF_FACTORY_KERNELS_ENABLED { if (GB_binop_builtin (op->xtype, false, Atype, false, - (GrB_BinaryOp) op, false, &opcode, &xcode, &ycode, &zcode)) + (GrB_BinaryOp) op, false, &opcode, &xcode, &ycode, + &zcode)) { - //---------------------------------------------------------- + //------------------------------------------------------ // define the worker for the switch factory - //---------------------------------------------------------- + //------------------------------------------------------ #define GB_bind1st(binop,xname) \ GB (_bind1st_ ## binop ## xname) - #define GB_BINOP_WORKER(binop,xname) \ - { \ - info = GB_bind1st (binop, xname) (Cx, scalarx, Ax, \ - Ab, anz, A_nthreads) ; \ - } \ + #define GB_BINOP_WORKER(binop,xname) \ + { \ + info = GB_bind1st (binop, xname) (Cx, scalarx, Ax, \ + Ab, anz, A_nthreads) ; \ + } \ break ; - //---------------------------------------------------------- + //------------------------------------------------------ // launch the switch factory - //---------------------------------------------------------- + //------------------------------------------------------ #define GB_NO_FIRST #define GB_NO_SECOND #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } } @@ -595,8 +599,10 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) //------------------------------------------------------------------ #if defined ( GRAPHBLAS_HAS_CUDA ) - if (GB_cuda_apply_binop_branch (ctype, (GrB_BinaryOp) op, A)) { - info = GB_cuda_apply_binop (Cx, ctype, (GrB_BinaryOp) op, A, scalarx, false) ; + if (GB_cuda_apply_binop_branch (ctype, (GrB_BinaryOp) op, A)) + { + info = GB_cuda_apply_binop (Cx, ctype, (GrB_BinaryOp) op, A, + scalarx, false) ; } #endif @@ -607,31 +613,32 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) GB_IF_FACTORY_KERNELS_ENABLED { if (GB_binop_builtin (Atype, false, op->ytype, false, - (GrB_BinaryOp) op, false, &opcode, &xcode, &ycode, &zcode)) + (GrB_BinaryOp) op, false, &opcode, &xcode, &ycode, + &zcode)) { - //---------------------------------------------------------- + //------------------------------------------------------ // define the worker for the switch factory - //---------------------------------------------------------- + //------------------------------------------------------ #define GB_bind2nd(binop,xname) \ GB (_bind2nd_ ## binop ## xname) #undef GB_BINOP_WORKER - #define GB_BINOP_WORKER(binop,xname) \ - { \ - info = GB_bind2nd (binop, xname) (Cx, Ax, scalarx, \ - Ab, anz, A_nthreads) ; \ - } \ + #define GB_BINOP_WORKER(binop,xname) \ + { \ + info = GB_bind2nd (binop, xname) (Cx, Ax, scalarx,\ + Ab, anz, A_nthreads) ; \ + } \ break ; - //---------------------------------------------------------- + //------------------------------------------------------ // launch the switch factory - //---------------------------------------------------------- + //------------------------------------------------------ #define GB_NO_FIRST #define GB_NO_SECOND #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } } @@ -671,7 +678,7 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) cast_A_to_Y (ywork, Ax +(p)*asize, asize) ; \ /* Cx [p] = fop (scalarx, ywork) */ \ fop (Cx +((p)*zsize), scalarx, ywork) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" } else { @@ -683,7 +690,7 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) cast_A_to_X (xwork, Ax +(p)*asize, asize) ; \ /* Cx [p] = fop (xwork, scalarx) */ \ fop (Cx +(p*zsize), xwork, scalarx) ; - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" } info = GrB_SUCCESS ; } @@ -765,7 +772,7 @@ GrB_Info GB_apply_op // apply a unary op, idxunop, or binop, Cx = op (A) cast_A_to_X (xwork, Ax +(p)*asize, asize) ; \ fop (Cx +(p*zsize), xwork, \ flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_apply_unop_ijp.c" + #include "apply/template/GB_apply_unop_ijp.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_shallow_op.c b/GraphBLAS/Source/apply/GB_shallow_op.c similarity index 99% rename from GraphBLAS/Source/GB_shallow_op.c rename to GraphBLAS/Source/apply/GB_shallow_op.c index 20a3d87938..6066ae0895 100644 --- a/GraphBLAS/Source/GB_shallow_op.c +++ b/GraphBLAS/Source/apply/GB_shallow_op.c @@ -24,7 +24,7 @@ // Compare this function with GB_shallow_copy.c. -#include "GB_apply.h" +#include "apply/GB_apply.h" #define GB_FREE_ALL GB_phybix_free (C) ; diff --git a/GraphBLAS/Source/GrB_Matrix_apply.c b/GraphBLAS/Source/apply/GrB_Matrix_apply.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_apply.c rename to GraphBLAS/Source/apply/GrB_Matrix_apply.c index 98d242144d..b6d699c08d 100644 --- a/GraphBLAS/Source/GrB_Matrix_apply.c +++ b/GraphBLAS/Source/apply/GrB_Matrix_apply.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_apply.h" -#include "GB_scalar_wrap.h" -#include "GB_get_mask.h" +#include "apply/GB_apply.h" +#include "scalar/GB_Scalar_wrap.h" +#include "mask/GB_get_mask.h" //------------------------------------------------------------------------------ // GrB_Matrix_apply: apply a unary operator to a matrix diff --git a/GraphBLAS/Source/GrB_Vector_apply.c b/GraphBLAS/Source/apply/GrB_Vector_apply.c similarity index 99% rename from GraphBLAS/Source/GrB_Vector_apply.c rename to GraphBLAS/Source/apply/GrB_Vector_apply.c index df672af861..455951f236 100644 --- a/GraphBLAS/Source/GrB_Vector_apply.c +++ b/GraphBLAS/Source/apply/GrB_Vector_apply.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_apply.h" -#include "GB_scalar_wrap.h" -#include "GB_get_mask.h" +#include "apply/GB_apply.h" +#include "scalar/GB_Scalar_wrap.h" +#include "mask/GB_get_mask.h" //------------------------------------------------------------------------------ // GrB_Vector_apply: apply a unary operator to a vector diff --git a/GraphBLAS/Source/Factories/GB_twotype_factory.c b/GraphBLAS/Source/apply/factory/GB_twotype_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_twotype_factory.c rename to GraphBLAS/Source/apply/factory/GB_twotype_factory.c diff --git a/GraphBLAS/Source/Factories/GB_unop_factory.c b/GraphBLAS/Source/apply/factory/GB_unop_factory.c similarity index 99% rename from GraphBLAS/Source/Factories/GB_unop_factory.c rename to GraphBLAS/Source/apply/factory/GB_unop_factory.c index 2fa00b037b..974b18b47d 100644 --- a/GraphBLAS/Source/Factories/GB_unop_factory.c +++ b/GraphBLAS/Source/apply/factory/GB_unop_factory.c @@ -39,7 +39,7 @@ ASSERT (code1 != code2) #define GB_OPNAME _identity #define GB_EXCLUDE_SAME_TYPES - #include "GB_twotype_factory.c" + #include "apply/factory/GB_twotype_factory.c" } else if ((code1 == GB_FP32_code && code2 == GB_FC32_code) || diff --git a/GraphBLAS/Source/Shared/GB_apply_shared_definitions.h b/GraphBLAS/Source/apply/include/GB_apply_shared_definitions.h similarity index 94% rename from GraphBLAS/Source/Shared/GB_apply_shared_definitions.h rename to GraphBLAS/Source/apply/include/GB_apply_shared_definitions.h index 89b2909b80..a3e829abdc 100644 --- a/GraphBLAS/Source/Shared/GB_apply_shared_definitions.h +++ b/GraphBLAS/Source/apply/include/GB_apply_shared_definitions.h @@ -12,7 +12,7 @@ // this file. This file is shared by generic, factory, and both CPU and // CUDA JIT kernels. -#include "GB_kernel_shared_definitions.h" +#include "include/GB_kernel_shared_definitions.h" #ifndef GB_APPLY_SHARED_DEFINITIONS_H #define GB_APPLY_SHARED_DEFINITIONS_H diff --git a/GraphBLAS/Source/Template/GB_apply_bind1st_template.c b/GraphBLAS/Source/apply/template/GB_apply_bind1st_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_apply_bind1st_template.c rename to GraphBLAS/Source/apply/template/GB_apply_bind1st_template.c diff --git a/GraphBLAS/Source/Template/GB_apply_bind2nd_template.c b/GraphBLAS/Source/apply/template/GB_apply_bind2nd_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_apply_bind2nd_template.c rename to GraphBLAS/Source/apply/template/GB_apply_bind2nd_template.c diff --git a/GraphBLAS/Source/Template/GB_apply_unop_ijp.c b/GraphBLAS/Source/apply/template/GB_apply_unop_ijp.c similarity index 100% rename from GraphBLAS/Source/Template/GB_apply_unop_ijp.c rename to GraphBLAS/Source/apply/template/GB_apply_unop_ijp.c diff --git a/GraphBLAS/Source/Template/GB_apply_unop_ip.c b/GraphBLAS/Source/apply/template/GB_apply_unop_ip.c similarity index 100% rename from GraphBLAS/Source/Template/GB_apply_unop_ip.c rename to GraphBLAS/Source/apply/template/GB_apply_unop_ip.c diff --git a/GraphBLAS/Source/Template/GB_apply_unop_template.c b/GraphBLAS/Source/apply/template/GB_apply_unop_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_apply_unop_template.c rename to GraphBLAS/Source/apply/template/GB_apply_unop_template.c diff --git a/GraphBLAS/Source/GB_assign.c b/GraphBLAS/Source/assign/GB_assign.c similarity index 98% rename from GraphBLAS/Source/GB_assign.c rename to GraphBLAS/Source/assign/GB_assign.c index adbc3e560b..1fdd6705a1 100644 --- a/GraphBLAS/Source/GB_assign.c +++ b/GraphBLAS/Source/assign/GB_assign.c @@ -34,11 +34,11 @@ GB_FREE_WORK (&J2, J2_size) ; \ } -#include "GB_assign.h" -#include "GB_assign_zombie.h" -#include "GB_subassign.h" -#include "GB_subref.h" -#include "GB_bitmap_assign.h" +#include "assign/GB_assign.h" +#include "assign/GB_assign_zombie.h" +#include "assign/GB_subassign.h" +#include "extract/GB_subref.h" +#include "assign/GB_bitmap_assign.h" GrB_Info GB_assign // C(Rows,Cols) += A or A' ( diff --git a/GraphBLAS/Source/GB_assign.h b/GraphBLAS/Source/assign/GB_assign.h similarity index 98% rename from GraphBLAS/Source/GB_assign.h rename to GraphBLAS/Source/assign/GB_assign.h index c9ce0530fb..ef491915e5 100644 --- a/GraphBLAS/Source/GB_assign.h +++ b/GraphBLAS/Source/assign/GB_assign.h @@ -10,7 +10,7 @@ #ifndef GB_ASSIGN_H #define GB_ASSIGN_H #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB_assign // C(Rows,Cols) += A or A' ( diff --git a/GraphBLAS/Source/GB_assign_burble.c b/GraphBLAS/Source/assign/GB_assign_burble.c similarity index 100% rename from GraphBLAS/Source/GB_assign_burble.c rename to GraphBLAS/Source/assign/GB_assign_burble.c diff --git a/GraphBLAS/Source/GB_assign_describe.c b/GraphBLAS/Source/assign/GB_assign_describe.c similarity index 100% rename from GraphBLAS/Source/GB_assign_describe.c rename to GraphBLAS/Source/assign/GB_assign_describe.c diff --git a/GraphBLAS/Source/GB_assign_prep.c b/GraphBLAS/Source/assign/GB_assign_prep.c similarity index 99% rename from GraphBLAS/Source/GB_assign_prep.c rename to GraphBLAS/Source/assign/GB_assign_prep.c index 7119755b6d..d94bfc5eee 100644 --- a/GraphBLAS/Source/GB_assign_prep.c +++ b/GraphBLAS/Source/assign/GB_assign_prep.c @@ -9,13 +9,13 @@ // GB_assign_prep checks the inputs for GB_assign and GB_subassign. -#include "GB_subassign.h" -#include "GB_bitmap_assign.h" -#include "GB_assign_zombie.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_methods.h" -#include "GB_transpose.h" -#include "GB_subref.h" +#include "assign/GB_subassign.h" +#include "assign/GB_bitmap_assign.h" +#include "assign/GB_assign_zombie.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "transpose/GB_transpose.h" +#include "extract/GB_subref.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -32,7 +32,7 @@ } // redefine to use the revised GB_FREE_ALL above: -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GB_assign_prep ( diff --git a/GraphBLAS/Source/GB_assign_scalar.c b/GraphBLAS/Source/assign/GB_assign_scalar.c similarity index 97% rename from GraphBLAS/Source/GB_assign_scalar.c rename to GraphBLAS/Source/assign/GB_assign_scalar.c index 9f3bbcac87..49ee4ecee6 100644 --- a/GraphBLAS/Source/GB_assign_scalar.c +++ b/GraphBLAS/Source/assign/GB_assign_scalar.c @@ -17,9 +17,9 @@ // Compare with GB_subassign_scalar, which uses M and C_replace differently -#include "GB_assign.h" -#include "GB_bitmap_assign.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "assign/GB_bitmap_assign.h" +#include "mask/GB_get_mask.h" GrB_Info GB_assign_scalar // C(Rows,Cols) += x ( diff --git a/GraphBLAS/Source/GB_assign_zombie.h b/GraphBLAS/Source/assign/GB_assign_zombie.h similarity index 98% rename from GraphBLAS/Source/GB_assign_zombie.h rename to GraphBLAS/Source/assign/GB_assign_zombie.h index 5c5188cf53..4a2e115068 100644 --- a/GraphBLAS/Source/GB_assign_zombie.h +++ b/GraphBLAS/Source/assign/GB_assign_zombie.h @@ -9,7 +9,7 @@ #ifndef GB_ASSIGN_ZOMBIE_H #define GB_ASSIGN_ZOMBIE_H -#include "GB_ij.h" +#include "ij/GB_ij.h" GrB_Info GB_assign_zombie1 ( diff --git a/GraphBLAS/Source/GB_assign_zombie1.c b/GraphBLAS/Source/assign/GB_assign_zombie1.c similarity index 98% rename from GraphBLAS/Source/GB_assign_zombie1.c rename to GraphBLAS/Source/assign/GB_assign_zombie1.c index 095371b6a7..561ddd3efc 100644 --- a/GraphBLAS/Source/GB_assign_zombie1.c +++ b/GraphBLAS/Source/assign/GB_assign_zombie1.c @@ -15,8 +15,8 @@ // C->iso is not affected. -#include "GB_assign.h" -#include "GB_assign_zombie.h" +#include "assign/GB_assign.h" +#include "assign/GB_assign_zombie.h" GrB_Info GB_assign_zombie1 ( diff --git a/GraphBLAS/Source/GB_assign_zombie2.c b/GraphBLAS/Source/assign/GB_assign_zombie2.c similarity index 98% rename from GraphBLAS/Source/GB_assign_zombie2.c rename to GraphBLAS/Source/assign/GB_assign_zombie2.c index e7b4769937..c1a95649a3 100644 --- a/GraphBLAS/Source/GB_assign_zombie2.c +++ b/GraphBLAS/Source/assign/GB_assign_zombie2.c @@ -15,8 +15,8 @@ // C->iso is not affected. -#include "GB_assign.h" -#include "GB_assign_zombie.h" +#include "assign/GB_assign.h" +#include "assign/GB_assign_zombie.h" GrB_Info GB_assign_zombie2 ( diff --git a/GraphBLAS/Source/GB_assign_zombie3.c b/GraphBLAS/Source/assign/GB_assign_zombie3.c similarity index 97% rename from GraphBLAS/Source/GB_assign_zombie3.c rename to GraphBLAS/Source/assign/GB_assign_zombie3.c index b6e792a48d..27d460348e 100644 --- a/GraphBLAS/Source/GB_assign_zombie3.c +++ b/GraphBLAS/Source/assign/GB_assign_zombie3.c @@ -23,10 +23,10 @@ // C->iso is not affected. -#include "GB_assign.h" -#include "GB_assign_zombie.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_methods.h" +#include "assign/GB_assign.h" +#include "assign/GB_assign_zombie.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" GrB_Info GB_assign_zombie3 ( diff --git a/GraphBLAS/Source/GB_assign_zombie4.c b/GraphBLAS/Source/assign/GB_assign_zombie4.c similarity index 99% rename from GraphBLAS/Source/GB_assign_zombie4.c rename to GraphBLAS/Source/assign/GB_assign_zombie4.c index b0bd60341e..8f0065d353 100644 --- a/GraphBLAS/Source/GB_assign_zombie4.c +++ b/GraphBLAS/Source/assign/GB_assign_zombie4.c @@ -23,8 +23,8 @@ // C->iso is not affected. -#include "GB_assign.h" -#include "GB_assign_zombie.h" +#include "assign/GB_assign.h" +#include "assign/GB_assign_zombie.h" GrB_Info GB_assign_zombie4 ( diff --git a/GraphBLAS/Source/GB_assign_zombie5.c b/GraphBLAS/Source/assign/GB_assign_zombie5.c similarity index 97% rename from GraphBLAS/Source/GB_assign_zombie5.c rename to GraphBLAS/Source/assign/GB_assign_zombie5.c index 9a55d50fd4..23560055c7 100644 --- a/GraphBLAS/Source/GB_assign_zombie5.c +++ b/GraphBLAS/Source/assign/GB_assign_zombie5.c @@ -22,11 +22,11 @@ // C->iso is not affected. -#include "GB_assign.h" -#include "GB_assign_zombie.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_methods.h" -#include "GB_ek_slice.h" +#include "assign/GB_assign.h" +#include "assign/GB_assign_zombie.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "slice/GB_ek_slice.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ diff --git a/GraphBLAS/Source/GB_bitmap_M_scatter.c b/GraphBLAS/Source/assign/GB_bitmap_M_scatter.c similarity index 86% rename from GraphBLAS/Source/GB_bitmap_M_scatter.c rename to GraphBLAS/Source/assign/GB_bitmap_M_scatter.c index e58ad65256..e02fe6f9b5 100644 --- a/GraphBLAS/Source/GB_bitmap_M_scatter.c +++ b/GraphBLAS/Source/assign/GB_bitmap_M_scatter.c @@ -9,8 +9,8 @@ // JIT: not needed, but variants possible for each kind of mask matrix. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GB_CALLBACK_BITMAP_M_SCATTER_PROTO (GB_bitmap_M_scatter) { @@ -45,21 +45,21 @@ GB_CALLBACK_BITMAP_M_SCATTER_PROTO (GB_bitmap_M_scatter) #undef GB_MASK_WORK #define GB_MASK_WORK(pC) Cb [pC] += 2 - #include "GB_bitmap_assign_M_template.c" + #include "assign/factory/GB_bitmap_assign_M_template.c" break ; case GB_BITMAP_M_SCATTER_MINUS_2 : // Cb (i,j) -= 2 #undef GB_MASK_WORK #define GB_MASK_WORK(pC) Cb [pC] -= 2 - #include "GB_bitmap_assign_M_template.c" + #include "assign/factory/GB_bitmap_assign_M_template.c" break ; case GB_BITMAP_M_SCATTER_MOD_2 : // Cb (i,j) %= 2 #undef GB_MASK_WORK #define GB_MASK_WORK(pC) Cb [pC] %= 2 - #include "GB_bitmap_assign_M_template.c" + #include "assign/factory/GB_bitmap_assign_M_template.c" break ; default: ; diff --git a/GraphBLAS/Source/GB_bitmap_M_scatter_whole.c b/GraphBLAS/Source/assign/GB_bitmap_M_scatter_whole.c similarity index 86% rename from GraphBLAS/Source/GB_bitmap_M_scatter_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_M_scatter_whole.c index 6bd8e1a81e..9ae55e04ef 100644 --- a/GraphBLAS/Source/GB_bitmap_M_scatter_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_M_scatter_whole.c @@ -9,8 +9,8 @@ // JIT: not needed, but variants possible for each kind of mask matrix. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GB_CALLBACK_BITMAP_M_SCATTER_WHOLE_PROTO (GB_bitmap_M_scatter_whole) { @@ -46,21 +46,21 @@ GB_CALLBACK_BITMAP_M_SCATTER_WHOLE_PROTO (GB_bitmap_M_scatter_whole) #undef GB_MASK_WORK #define GB_MASK_WORK(pC) Cb [pC] += 2 - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" break ; case GB_BITMAP_M_SCATTER_MINUS_2 : // Cb (i,j) -= 2 #undef GB_MASK_WORK #define GB_MASK_WORK(pC) Cb [pC] -= 2 - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" break ; case GB_BITMAP_M_SCATTER_SET_2 : // Cb (i,j) = 2 #undef GB_MASK_WORK #define GB_MASK_WORK(pC) Cb [pC] = 2 - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" break ; default: ; diff --git a/GraphBLAS/Source/GB_bitmap_assign.c b/GraphBLAS/Source/assign/GB_bitmap_assign.c similarity index 98% rename from GraphBLAS/Source/GB_bitmap_assign.c rename to GraphBLAS/Source/assign/GB_bitmap_assign.c index c1ce1a76ee..0a047c4d5f 100644 --- a/GraphBLAS/Source/GB_bitmap_assign.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign.c @@ -14,8 +14,8 @@ // whole_C_matrix case with GB_bitmap_assign_noM_noaccum_whole). For that // method, C can be returned with any sparsity structure. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL GB_phybix_free (C) ; diff --git a/GraphBLAS/Source/GB_bitmap_assign.h b/GraphBLAS/Source/assign/GB_bitmap_assign.h similarity index 98% rename from GraphBLAS/Source/GB_bitmap_assign.h rename to GraphBLAS/Source/assign/GB_bitmap_assign.h index a45a05bfbe..ece8114191 100644 --- a/GraphBLAS/Source/GB_bitmap_assign.h +++ b/GraphBLAS/Source/assign/GB_bitmap_assign.h @@ -10,7 +10,7 @@ #ifndef GB_BITMAP_ASSIGN_H #define GB_BITMAP_ASSIGN_H #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB_bitmap_assign ( diff --git a/GraphBLAS/Source/GB_bitmap_assign_M_accum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_M_accum.c similarity index 95% rename from GraphBLAS/Source/GB_bitmap_assign_M_accum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_M_accum.c index 8bbe50b16c..758b0259f2 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_M_accum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_M_accum.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -115,7 +115,7 @@ GrB_Info GB_bitmap_assign_M_accum GB_ACCUMULATE_scalar (Cx, pC, ywork) ; \ } \ } - #include "GB_bitmap_assign_M_sub_template.c" + #include "assign/factory/GB_bitmap_assign_M_sub_template.c" if (C_replace) { @@ -127,7 +127,7 @@ GrB_Info GB_bitmap_assign_M_accum Cb [pC] = (cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } } @@ -174,7 +174,7 @@ GrB_Info GB_bitmap_assign_M_accum GB_ACCUMULATE_scalar (Cx, pC, ywork) ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -211,7 +211,7 @@ GrB_Info GB_bitmap_assign_M_accum GB_ACCUMULATE_aij (Cx, pC, Ax, pA, A_iso, ywork) ; \ } \ } - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" } //---------------------------------------------------------------------- @@ -235,7 +235,7 @@ GrB_Info GB_bitmap_assign_M_accum Cb [pC] = (cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } else { diff --git a/GraphBLAS/Source/GB_bitmap_assign_M_accum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_M_accum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_M_accum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_M_accum_whole.c index 8bf48ce899..67eb2a28ab 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_M_accum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_M_accum_whole.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -123,7 +123,7 @@ GrB_Info GB_bitmap_assign_M_accum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -151,7 +151,7 @@ GrB_Info GB_bitmap_assign_M_accum_whole task_cnvals++ ; \ } \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } } @@ -221,7 +221,7 @@ GrB_Info GB_bitmap_assign_M_accum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -253,7 +253,7 @@ GrB_Info GB_bitmap_assign_M_accum_whole } \ } \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } } @@ -295,7 +295,7 @@ GrB_Info GB_bitmap_assign_M_accum_whole GB_ACCUMULATE_aij (Cx, pC, Ax, pA, A_iso, ywork) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" if (C_replace) { @@ -307,7 +307,7 @@ GrB_Info GB_bitmap_assign_M_accum_whole Cb [pC] = (cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else { diff --git a/GraphBLAS/Source/GB_bitmap_assign_M_noaccum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_M_noaccum.c similarity index 94% rename from GraphBLAS/Source/GB_bitmap_assign_M_noaccum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_M_noaccum.c index cb28baa4c9..625127bcf3 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_M_noaccum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_M_noaccum.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -140,7 +140,7 @@ GrB_Info GB_bitmap_assign_M_noaccum task_cnvals-- ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else // assign_kind == GB_ASSIGN @@ -165,7 +165,7 @@ GrB_Info GB_bitmap_assign_M_noaccum task_cnvals += (cb == 2) ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" if (C_replace) { @@ -177,7 +177,7 @@ GrB_Info GB_bitmap_assign_M_noaccum Cb [pC] = (cb == 4 || cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } else { @@ -219,7 +219,7 @@ GrB_Info GB_bitmap_assign_M_noaccum task_cnvals += (cb == 2) ; \ } \ } - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" //---------------------------------------------------------------------- // clear M from C and handle C_replace for row/col/assign @@ -242,7 +242,7 @@ GrB_Info GB_bitmap_assign_M_noaccum Cb [pC] = (cb == 4) ; \ task_cnvals -= (cb == 1 || cb == 3) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -255,7 +255,7 @@ GrB_Info GB_bitmap_assign_M_noaccum Cb [pC] = (cb == 4 || cb == 1) ; \ task_cnvals -= (cb == 3) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } } @@ -279,7 +279,7 @@ GrB_Info GB_bitmap_assign_M_noaccum Cb [pC] = (cb == 4) ? 3 : 0 ; \ task_cnvals -= (cb == 1 || cb == 3) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" // for all of C #undef GB_CIJ_WORK @@ -290,7 +290,7 @@ GrB_Info GB_bitmap_assign_M_noaccum Cb [pC] = (cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } else { @@ -303,7 +303,7 @@ GrB_Info GB_bitmap_assign_M_noaccum Cb [pC] = (cb == 4 || cb == 1) ; \ task_cnvals -= (cb == 3) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" // clear M from C // Cb [pC] %= 2 for each entry M(i,j) in the mask diff --git a/GraphBLAS/Source/GB_bitmap_assign_M_noaccum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_M_noaccum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_M_noaccum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_M_noaccum_whole.c index 62d2aafc0a..4b152fe4db 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_M_noaccum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_M_noaccum_whole.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -124,7 +124,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -152,7 +152,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole task_cnvals++ ; \ } \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } @@ -228,7 +228,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -268,7 +268,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole } \ } \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } } @@ -310,7 +310,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole task_cnvals += (cb == 2) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" // clear the mask and delete entries not assigned #undef GB_CIJ_WORK @@ -320,7 +320,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole Cb [pC] = (cb == 4) ; \ task_cnvals -= (cb == 1 || cb == 3) ; \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else if (GB_nnz (A) == 0) @@ -340,7 +340,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole Cb [pC] = 0 ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } else @@ -374,7 +374,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole task_cnvals += (cb == 2) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" // clear the mask and delete entries not assigned #undef GB_MASK_WORK @@ -384,7 +384,7 @@ GrB_Info GB_bitmap_assign_M_noaccum_whole Cb [pC] = (cb == 1) ; \ task_cnvals -= (cb == 3) ; \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } } diff --git a/GraphBLAS/Source/GB_bitmap_assign_fullM_accum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_accum.c similarity index 94% rename from GraphBLAS/Source/GB_bitmap_assign_fullM_accum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_fullM_accum.c index 7ea2710abc..06c6b8a313 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_fullM_accum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_accum.c @@ -30,8 +30,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -147,13 +147,13 @@ GrB_Info GB_bitmap_assign_fullM_accum // C(I,J) += scalar where M has the same size as C #undef GB_GET_pM #define GB_GET_pM pC - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; case GB_SUBASSIGN : // C(I,J) += scalar where M has the same size as A #undef GB_GET_pM #define GB_GET_pM pA - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; default: ; } @@ -211,25 +211,25 @@ GrB_Info GB_bitmap_assign_fullM_accum // C(i,J) += A where m is a 1-by-C->vdim row vector #undef GB_GET_pM #define GB_GET_pM jC - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" break ; case GB_COL_ASSIGN : // C(I,j) += A where m is a C->vlen-by-1 column vector #undef GB_GET_pM #define GB_GET_pM iC - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" break ; case GB_ASSIGN : // C(I,J) += A where M has the same size as C #undef GB_GET_pM #define GB_GET_pM pC - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" break ; case GB_SUBASSIGN : // C(I,J) += A where M has the same size as A #undef GB_GET_pM #define GB_GET_pM (iA + jA * nI) - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" break ; default: ; } @@ -260,7 +260,7 @@ GrB_Info GB_bitmap_assign_fullM_accum task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/GB_bitmap_assign_fullM_accum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_accum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_fullM_accum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_fullM_accum_whole.c index bccee86bca..4163b663bb 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_fullM_accum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_accum_whole.c @@ -30,8 +30,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -125,7 +125,7 @@ GrB_Info GB_bitmap_assign_fullM_accum_whole task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -154,7 +154,7 @@ GrB_Info GB_bitmap_assign_fullM_accum_whole } \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -204,7 +204,7 @@ GrB_Info GB_bitmap_assign_fullM_accum_whole task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -234,7 +234,7 @@ GrB_Info GB_bitmap_assign_fullM_accum_whole } \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -267,7 +267,7 @@ GrB_Info GB_bitmap_assign_fullM_accum_whole } \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" // clear the mask and delete entries not assigned if (C_replace) @@ -282,7 +282,7 @@ GrB_Info GB_bitmap_assign_fullM_accum_whole task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } } diff --git a/GraphBLAS/Source/GB_bitmap_assign_fullM_noaccum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_noaccum.c similarity index 91% rename from GraphBLAS/Source/GB_bitmap_assign_fullM_noaccum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_fullM_noaccum.c index 9e2b217378..174df108d1 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_fullM_noaccum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_noaccum.c @@ -30,8 +30,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -113,7 +113,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } //-------------------------------------------------------------------------- @@ -153,13 +153,13 @@ GrB_Info GB_bitmap_assign_fullM_noaccum // C(I,J) = scalar where M has the same size as C #undef GB_GET_pM #define GB_GET_pM pC - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; case GB_SUBASSIGN : // C(I,J) = scalar where M has the same size as A #undef GB_GET_pM #define GB_GET_pM pA - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; default: ; } @@ -229,32 +229,32 @@ GrB_Info GB_bitmap_assign_fullM_noaccum // C(i,J) = A where m is a 1-by-C->vdim row vector #undef GB_GET_pM #define GB_GET_pM jC - #include "GB_bitmap_assign_A_template.c" - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; case GB_COL_ASSIGN : // C(I,j) = A where m is a C->vlen-by-1 column vector #undef GB_GET_pM #define GB_GET_pM iC - #include "GB_bitmap_assign_A_template.c" - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; case GB_ASSIGN : // C(I,J) = A where M has the same size as C #undef GB_GET_pM #define GB_GET_pM pC - #include "GB_bitmap_assign_A_template.c" - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; case GB_SUBASSIGN : // C(I,J) = A where M has the same size as A #undef GB_GET_pM #define GB_GET_pM (iA + jA * nI) - #include "GB_bitmap_assign_A_template.c" - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" break ; default: ; diff --git a/GraphBLAS/Source/GB_bitmap_assign_fullM_noaccum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_noaccum_whole.c similarity index 95% rename from GraphBLAS/Source/GB_bitmap_assign_fullM_noaccum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_fullM_noaccum_whole.c index 790452aefc..c4de958d9d 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_fullM_noaccum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_fullM_noaccum_whole.c @@ -30,8 +30,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -116,7 +116,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -138,7 +138,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole task_cnvals += (cb == 0) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -181,7 +181,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -212,7 +212,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole } \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } else @@ -246,7 +246,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole task_cnvals++ ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" } else @@ -270,7 +270,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole task_cnvals += (cb == 0) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" // delete entries where M(i,j)=1 but not assigned by A #undef GB_CIJ_WORK @@ -283,7 +283,7 @@ GrB_Info GB_bitmap_assign_fullM_noaccum_whole task_cnvals -= (cb == 1) ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } } diff --git a/GraphBLAS/Source/GB_bitmap_assign_methods.h b/GraphBLAS/Source/assign/GB_bitmap_assign_methods.h similarity index 98% rename from GraphBLAS/Source/GB_bitmap_assign_methods.h rename to GraphBLAS/Source/assign/GB_bitmap_assign_methods.h index b9ca78ec8c..bfe7ee8560 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_methods.h +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_methods.h @@ -10,13 +10,13 @@ #ifndef GB_BITMAP_ASSIGN_METHODS_H #define GB_BITMAP_ASSIGN_METHODS_H -#include "GB_callback_proto.h" -#include "GB_bitmap_assign.h" -#include "GB_ek_slice.h" -#include "GB_ij.h" -#include "GB_subassign_IxJ_slice.h" -#include "GB_unused.h" -#include "GB_bitmap_scatter.h" +#include "GB.h" +#include "assign/GB_bitmap_assign.h" +#include "slice/GB_ek_slice.h" +#include "ij/GB_ij.h" +#include "assign/GB_subassign_IxJ_slice.h" +#include "include/GB_unused.h" +#include "assign/include/GB_bitmap_scatter.h" //------------------------------------------------------------------------------ // prototypes diff --git a/GraphBLAS/Source/GB_bitmap_assign_noM_accum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_accum.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_noM_accum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_noM_accum.c index f7868ab2d0..ef14dea4db 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_noM_accum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_accum.c @@ -34,8 +34,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -118,7 +118,7 @@ GrB_Info GB_bitmap_assign_noM_accum GB_ACCUMULATE_scalar (Cx, pC, ywork) ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -152,7 +152,7 @@ GrB_Info GB_bitmap_assign_noM_accum GB_ACCUMULATE_aij (Cx, pC, Ax, pA, A_iso, ywork) ; \ } \ } - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" } } @@ -180,7 +180,7 @@ GrB_Info GB_bitmap_assign_noM_accum Cb [pC] = 0 ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } #endif diff --git a/GraphBLAS/Source/GB_bitmap_assign_noM_accum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_accum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_noM_accum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_noM_accum_whole.c index 563137fa31..e1c3c7307f 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_noM_accum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_accum_whole.c @@ -34,8 +34,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -110,7 +110,7 @@ GrB_Info GB_bitmap_assign_noM_accum_whole } if (!C_iso) { - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } // free the bitmap or set it to all ones @@ -149,7 +149,7 @@ GrB_Info GB_bitmap_assign_noM_accum_whole } if (!C_iso) { - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } // free the bitmap or set it to all ones @@ -183,7 +183,7 @@ GrB_Info GB_bitmap_assign_noM_accum_whole } \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" C->nvals = cnvals ; } @@ -211,7 +211,7 @@ GrB_Info GB_bitmap_assign_noM_accum_whole GB_ACCUMULATE_aij (Cx, pC, Ax, pA, A_iso, ywork) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" C->nvals = cnvals ; } } diff --git a/GraphBLAS/Source/GB_bitmap_assign_noM_noaccum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_noaccum.c similarity index 94% rename from GraphBLAS/Source/GB_bitmap_assign_noM_noaccum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_noM_noaccum.c index 027402c9aa..21638ae567 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_noM_noaccum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_noaccum.c @@ -36,8 +36,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -108,7 +108,7 @@ GrB_Info GB_bitmap_assign_noM_noaccum Cb [pC] = 0 ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } } @@ -136,7 +136,7 @@ GrB_Info GB_bitmap_assign_noM_noaccum Cb [pC] = 1 ; \ task_cnvals += (cb == 0) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -156,7 +156,7 @@ GrB_Info GB_bitmap_assign_noM_noaccum Cb [pC] = 0 ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } // for all entries aij in A (A hyper, sparse, bitmap, or full) @@ -170,7 +170,7 @@ GrB_Info GB_bitmap_assign_noM_noaccum GB_COPY_aij_to_C (Cx, pC, Ax, pA, A_iso, cwork) ; \ Cb [pC] = 1 ; \ } - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" cnvals += GB_nnz (A) ; } diff --git a/GraphBLAS/Source/GB_bitmap_assign_noM_noaccum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_noaccum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_noM_noaccum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_noM_noaccum_whole.c index 8cc5e459cb..51875e256f 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_noM_noaccum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_noM_noaccum_whole.c @@ -43,9 +43,9 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_dense.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_dense.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -159,7 +159,7 @@ GrB_Info GB_bitmap_assign_noM_noaccum_whole GB_COPY_aij_to_C (Cx, pC, Ax, pA, A_iso, cwork) ; \ Cb [pC] = 1 ; \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" C->nvals = GB_nnz (A) ; } } diff --git a/GraphBLAS/Source/GB_bitmap_assign_notM_accum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_accum.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_notM_accum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_notM_accum.c index 0d45ac5a4a..e2f1a08c68 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_notM_accum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_accum.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -116,7 +116,7 @@ GrB_Info GB_bitmap_assign_notM_accum GB_ACCUMULATE_scalar (Cx, pC, ywork) ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -153,7 +153,7 @@ GrB_Info GB_bitmap_assign_notM_accum GB_ACCUMULATE_aij (Cx, pC, Ax, pA, A_iso, ywork) ; \ } \ } - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" } //-------------------------------------------------------------------------- @@ -182,7 +182,7 @@ GrB_Info GB_bitmap_assign_notM_accum task_cnvals -= (cb == 3) ; \ Cb [pC] = 0 ; \ } - #include "GB_bitmap_assign_M_template.c" + #include "assign/factory/GB_bitmap_assign_M_template.c" } //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/GB_bitmap_assign_notM_accum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_accum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_notM_accum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_notM_accum_whole.c index ac3b09b783..b46f817daf 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_notM_accum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_accum_whole.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -130,7 +130,7 @@ GrB_Info GB_bitmap_assign_notM_accum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -166,7 +166,7 @@ GrB_Info GB_bitmap_assign_notM_accum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -224,7 +224,7 @@ GrB_Info GB_bitmap_assign_notM_accum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -267,7 +267,7 @@ GrB_Info GB_bitmap_assign_notM_accum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -296,7 +296,7 @@ GrB_Info GB_bitmap_assign_notM_accum_whole GB_ACCUMULATE_aij (Cx, pC, Ax, pA, A_iso, ywork) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" if (C_replace) { @@ -308,7 +308,7 @@ GrB_Info GB_bitmap_assign_notM_accum_whole Cb [pC] = 0 ; \ task_cnvals -= (cb == 3) ; \ } - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" } else { diff --git a/GraphBLAS/Source/GB_bitmap_assign_notM_noaccum.c b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_noaccum.c similarity index 95% rename from GraphBLAS/Source/GB_bitmap_assign_notM_noaccum.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_notM_noaccum.c index cd1fbd1525..7f1deaa0aa 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_notM_noaccum.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_noaccum.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -127,7 +127,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum Cb [pC] = (cb == 3) ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -159,7 +159,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum task_cnvals += (cb == 0) ; \ } \ } - #include "GB_bitmap_assign_A_template.c" + #include "assign/factory/GB_bitmap_assign_A_template.c" //---------------------------------------------------------------------- // handle entries in IxJ @@ -175,7 +175,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum Cb [pC] = (cb == 4) ; \ task_cnvals -= (cb == 1 || cb == 3) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else { @@ -187,7 +187,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum Cb [pC] = (cb == 4 || cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } } @@ -211,7 +211,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum Cb [pC] = (cb == 1) ; \ task_cnvals -= (cb == 3) ; \ } - #include "GB_bitmap_assign_C_template.c" + #include "assign/factory/GB_bitmap_assign_C_template.c" } else { diff --git a/GraphBLAS/Source/GB_bitmap_assign_notM_noaccum_whole.c b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_noaccum_whole.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_assign_notM_noaccum_whole.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_notM_noaccum_whole.c index f6a414e1c1..2b05ac6b4c 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_notM_noaccum_whole.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_notM_noaccum_whole.c @@ -24,8 +24,8 @@ // JIT: needed. -#include "GB_bitmap_assign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ @@ -128,7 +128,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -164,7 +164,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -228,7 +228,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else @@ -276,7 +276,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole default: ; \ } \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } @@ -300,7 +300,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole task_cnvals += (cb == 0) ; \ } \ } - #include "GB_bitmap_assign_A_whole_template.c" + #include "assign/factory/GB_bitmap_assign_A_whole_template.c" // clear the mask and delete entries not assigned if (C_replace) @@ -312,7 +312,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole Cb [pC] = (cb == 4) ; \ task_cnvals -= (cb == 1 || cb == 3) ; \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } else { @@ -323,7 +323,7 @@ GrB_Info GB_bitmap_assign_notM_noaccum_whole Cb [pC] = (cb == 4 || cb == 3) ; \ task_cnvals -= (cb == 1) ; \ } - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } } } diff --git a/GraphBLAS/Source/GB_bitmap_assign_to_full.c b/GraphBLAS/Source/assign/GB_bitmap_assign_to_full.c similarity index 97% rename from GraphBLAS/Source/GB_bitmap_assign_to_full.c rename to GraphBLAS/Source/assign/GB_bitmap_assign_to_full.c index 5aab23a83c..a05e24fe2b 100644 --- a/GraphBLAS/Source/GB_bitmap_assign_to_full.c +++ b/GraphBLAS/Source/assign/GB_bitmap_assign_to_full.c @@ -10,7 +10,7 @@ // All entries in C are now present. Either set all of C->b to 1, or free it // and make C full. -#include "GB_bitmap_assign_methods.h" +#include "assign/GB_bitmap_assign_methods.h" void GB_bitmap_assign_to_full // set all C->b to 1, or free it and make C full ( diff --git a/GraphBLAS/Source/GB_subassign.c b/GraphBLAS/Source/assign/GB_subassign.c similarity index 98% rename from GraphBLAS/Source/GB_subassign.c rename to GraphBLAS/Source/assign/GB_subassign.c index a7b7930c03..4f44ee96a7 100644 --- a/GraphBLAS/Source/GB_subassign.c +++ b/GraphBLAS/Source/assign/GB_subassign.c @@ -20,8 +20,8 @@ // Compare with GB_assign, which uses M and C_replace differently -#include "GB_subassign.h" -#include "GB_bitmap_assign.h" +#include "assign/GB_subassign.h" +#include "assign/GB_bitmap_assign.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_subassign.h b/GraphBLAS/Source/assign/GB_subassign.h similarity index 99% rename from GraphBLAS/Source/GB_subassign.h rename to GraphBLAS/Source/assign/GB_subassign.h index a545b1aa04..ae1bed76b5 100644 --- a/GraphBLAS/Source/GB_subassign.h +++ b/GraphBLAS/Source/assign/GB_subassign.h @@ -9,8 +9,8 @@ #ifndef GB_SUBASSIGN_H #define GB_SUBASSIGN_H -#include "GB_ij.h" -#include "GB_add.h" +#include "ij/GB_ij.h" +#include "ewise/GB_add.h" GrB_Info GB_subassign // C(Rows,Cols) += A or A' ( diff --git a/GraphBLAS/Source/GB_subassign_01.c b/GraphBLAS/Source/assign/GB_subassign_01.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_01.c rename to GraphBLAS/Source/assign/GB_subassign_01.c index 231acc2aad..307b0d0649 100644 --- a/GraphBLAS/Source/GB_subassign_01.c +++ b/GraphBLAS/Source/assign/GB_subassign_01.c @@ -20,8 +20,8 @@ // C: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_01 ( diff --git a/GraphBLAS/Source/GB_subassign_02.c b/GraphBLAS/Source/assign/GB_subassign_02.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_02.c rename to GraphBLAS/Source/assign/GB_subassign_02.c index e644a8aa19..b1d573a059 100644 --- a/GraphBLAS/Source/GB_subassign_02.c +++ b/GraphBLAS/Source/assign/GB_subassign_02.c @@ -21,8 +21,8 @@ // C: not bitmap or full: use GB_bitmap_assign instead // A: any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_02 ( diff --git a/GraphBLAS/Source/GB_subassign_03.c b/GraphBLAS/Source/assign/GB_subassign_03.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_03.c rename to GraphBLAS/Source/assign/GB_subassign_03.c index c65b3bf04b..e944dd2dbe 100644 --- a/GraphBLAS/Source/GB_subassign_03.c +++ b/GraphBLAS/Source/assign/GB_subassign_03.c @@ -20,8 +20,8 @@ // C is not bitmap: use GB_bitmap_assign instead -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_03 ( diff --git a/GraphBLAS/Source/GB_subassign_04.c b/GraphBLAS/Source/assign/GB_subassign_04.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_04.c rename to GraphBLAS/Source/assign/GB_subassign_04.c index 65c643d408..a7b455c852 100644 --- a/GraphBLAS/Source/GB_subassign_04.c +++ b/GraphBLAS/Source/assign/GB_subassign_04.c @@ -21,8 +21,8 @@ // C: not bitmap: use GB_bitmap_assign instead // A: any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_04 ( diff --git a/GraphBLAS/Source/GB_subassign_05.c b/GraphBLAS/Source/assign/GB_subassign_05.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_05.c rename to GraphBLAS/Source/assign/GB_subassign_05.c index 2ddc12e85f..88db737782 100644 --- a/GraphBLAS/Source/GB_subassign_05.c +++ b/GraphBLAS/Source/assign/GB_subassign_05.c @@ -21,8 +21,8 @@ // C: not bitmap // M: any sparsity -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_05 ( diff --git a/GraphBLAS/Source/GB_subassign_05d.c b/GraphBLAS/Source/assign/GB_subassign_05d.c similarity index 94% rename from GraphBLAS/Source/GB_subassign_05d.c rename to GraphBLAS/Source/assign/GB_subassign_05d.c index ab62ee7cb0..baede03fe1 100644 --- a/GraphBLAS/Source/GB_subassign_05d.c +++ b/GraphBLAS/Source/assign/GB_subassign_05d.c @@ -22,13 +22,13 @@ // C can have any sparsity structure, but it must be entirely dense with // all entries present. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_dense.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_dense.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_as__include.h" +#include "FactoryKernels/GB_as__include.h" #endif #undef GB_FREE_ALL @@ -163,7 +163,7 @@ GrB_Info GB_subassign_05d if (info == GrB_NO_VALUE) { - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (M, "(generic C(:,:)=x assign) ") ; // Cx [pC] = cwork @@ -171,7 +171,7 @@ GrB_Info GB_subassign_05d #define GB_COPY_scalar_to_C(Cx,pC,cwork) \ memcpy (Cx + ((pC)*csize), cwork, csize) - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_subassign_05e.c b/GraphBLAS/Source/assign/GB_subassign_05e.c similarity index 97% rename from GraphBLAS/Source/GB_subassign_05e.c rename to GraphBLAS/Source/assign/GB_subassign_05e.c index b98eb2914f..ed7b55b461 100644 --- a/GraphBLAS/Source/GB_subassign_05e.c +++ b/GraphBLAS/Source/assign/GB_subassign_05e.c @@ -26,8 +26,8 @@ // C is always iso, and its iso value has been assigned by GB_assign_prep. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL diff --git a/GraphBLAS/Source/GB_subassign_06d.c b/GraphBLAS/Source/assign/GB_subassign_06d.c similarity index 94% rename from GraphBLAS/Source/GB_subassign_06d.c rename to GraphBLAS/Source/assign/GB_subassign_06d.c index ccff36ddf1..7bf55a7305 100644 --- a/GraphBLAS/Source/GB_subassign_06d.c +++ b/GraphBLAS/Source/assign/GB_subassign_06d.c @@ -28,12 +28,12 @@ // C and A can have any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_dense.h" -#include "GB_stringify.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_dense.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_as__include.h" +#include "FactoryKernels/GB_as__include.h" #endif #undef GB_FREE_ALL @@ -97,7 +97,7 @@ GrB_Info GB_subassign_06d ASSERT (Mask_struct) ; #define GB_ISO_ASSIGN - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" info = GrB_SUCCESS ; } @@ -177,7 +177,7 @@ GrB_Info GB_subassign_06d if (info == GrB_NO_VALUE) { - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (A, "(generic C(:,:)=A assign) ") ; const size_t csize = C->type->size ; @@ -189,7 +189,7 @@ GrB_Info GB_subassign_06d #undef GB_AX_MASK #define GB_AX_MASK(Ax,pA,asize) GB_MCAST (Ax, pA, asize) - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_subassign_06n.c b/GraphBLAS/Source/assign/GB_subassign_06n.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_06n.c rename to GraphBLAS/Source/assign/GB_subassign_06n.c index 5fc3619e19..ccc75af498 100644 --- a/GraphBLAS/Source/GB_subassign_06n.c +++ b/GraphBLAS/Source/assign/GB_subassign_06n.c @@ -29,8 +29,8 @@ // C is not bitmap: GB_bitmap_assign is used if C is bitmap. // M and A are not bitmap: 06s is used instead, if M or A are bitmap. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_06n ( diff --git a/GraphBLAS/Source/GB_subassign_06s_and_14.c b/GraphBLAS/Source/assign/GB_subassign_06s_and_14.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_06s_and_14.c rename to GraphBLAS/Source/assign/GB_subassign_06s_and_14.c index 1b3112ec89..a3f82ddc77 100644 --- a/GraphBLAS/Source/GB_subassign_06s_and_14.c +++ b/GraphBLAS/Source/assign/GB_subassign_06s_and_14.c @@ -22,8 +22,8 @@ // C: not bitmap or full: use GB_bitmap_assign instead // M, A: any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_06s_and_14 ( diff --git a/GraphBLAS/Source/GB_subassign_07.c b/GraphBLAS/Source/assign/GB_subassign_07.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_07.c rename to GraphBLAS/Source/assign/GB_subassign_07.c index c4517f2e91..bbb0e8c0cb 100644 --- a/GraphBLAS/Source/GB_subassign_07.c +++ b/GraphBLAS/Source/assign/GB_subassign_07.c @@ -21,8 +21,8 @@ // C: not bitmap // M: any sparsity -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_07 ( diff --git a/GraphBLAS/Source/GB_subassign_08n.c b/GraphBLAS/Source/assign/GB_subassign_08n.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_08n.c rename to GraphBLAS/Source/assign/GB_subassign_08n.c index 6067590928..d8abe5c704 100644 --- a/GraphBLAS/Source/GB_subassign_08n.c +++ b/GraphBLAS/Source/assign/GB_subassign_08n.c @@ -22,8 +22,8 @@ // If C is bitmap, then GB_bitmap_assign_M_accum is used instead. // M, A: not bitmap; Method 08s is used instead if M or A are bitmap. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // GB_PHASE1_ACTION diff --git a/GraphBLAS/Source/GB_subassign_08n_slice.c b/GraphBLAS/Source/assign/GB_subassign_08n_slice.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_08n_slice.c rename to GraphBLAS/Source/assign/GB_subassign_08n_slice.c index 24a3d2a067..e6a72fab0a 100644 --- a/GraphBLAS/Source/GB_subassign_08n_slice.c +++ b/GraphBLAS/Source/assign/GB_subassign_08n_slice.c @@ -27,11 +27,11 @@ // instead (which handles both M and A as bitmap). As a result, this method // does not need to consider the bitmap case for C, M, or A. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_emult.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "ewise/GB_emult.h" // Npending is set to NULL by the GB_EMPTY_TASKLIST macro, but unused here. -#include "GB_unused.h" +#include "include/GB_unused.h" GrB_Info GB_subassign_08n_slice ( diff --git a/GraphBLAS/Source/GB_subassign_08s_and_16.c b/GraphBLAS/Source/assign/GB_subassign_08s_and_16.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_08s_and_16.c rename to GraphBLAS/Source/assign/GB_subassign_08s_and_16.c index 8a7809d75d..5fbefa28d1 100644 --- a/GraphBLAS/Source/GB_subassign_08s_and_16.c +++ b/GraphBLAS/Source/assign/GB_subassign_08s_and_16.c @@ -22,8 +22,8 @@ // C: not bitmap: use GB_bitmap_assign instead // M, A: any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_08s_and_16 ( diff --git a/GraphBLAS/Source/GB_subassign_09.c b/GraphBLAS/Source/assign/GB_subassign_09.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_09.c rename to GraphBLAS/Source/assign/GB_subassign_09.c index cf6e35098f..a59184f53e 100644 --- a/GraphBLAS/Source/GB_subassign_09.c +++ b/GraphBLAS/Source/assign/GB_subassign_09.c @@ -20,9 +20,9 @@ // C: not bitmap or full -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_unused.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "include/GB_unused.h" GrB_Info GB_subassign_09 ( diff --git a/GraphBLAS/Source/GB_subassign_10_and_18.c b/GraphBLAS/Source/assign/GB_subassign_10_and_18.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_10_and_18.c rename to GraphBLAS/Source/assign/GB_subassign_10_and_18.c index e27b59df62..1ee13359c4 100644 --- a/GraphBLAS/Source/GB_subassign_10_and_18.c +++ b/GraphBLAS/Source/assign/GB_subassign_10_and_18.c @@ -22,8 +22,8 @@ // C: not bitmap: use GB_bitmap_assign instead // M, A: any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_10_and_18 ( diff --git a/GraphBLAS/Source/GB_subassign_11.c b/GraphBLAS/Source/assign/GB_subassign_11.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_11.c rename to GraphBLAS/Source/assign/GB_subassign_11.c index daa740e8a2..6879ccd84a 100644 --- a/GraphBLAS/Source/GB_subassign_11.c +++ b/GraphBLAS/Source/assign/GB_subassign_11.c @@ -20,9 +20,9 @@ // C, M: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_unused.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "include/GB_unused.h" GrB_Info GB_subassign_11 ( diff --git a/GraphBLAS/Source/GB_subassign_12_and_20.c b/GraphBLAS/Source/assign/GB_subassign_12_and_20.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_12_and_20.c rename to GraphBLAS/Source/assign/GB_subassign_12_and_20.c index 1d4ae6762e..9e3624227d 100644 --- a/GraphBLAS/Source/GB_subassign_12_and_20.c +++ b/GraphBLAS/Source/assign/GB_subassign_12_and_20.c @@ -22,8 +22,8 @@ // C: not bitmap: use GB_bitmap_assign instead // M, A: any sparsity structure. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_12_and_20 ( diff --git a/GraphBLAS/Source/GB_subassign_13.c b/GraphBLAS/Source/assign/GB_subassign_13.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_13.c rename to GraphBLAS/Source/assign/GB_subassign_13.c index 29cc3e86d2..6e8d3a9e5d 100644 --- a/GraphBLAS/Source/GB_subassign_13.c +++ b/GraphBLAS/Source/assign/GB_subassign_13.c @@ -21,8 +21,8 @@ // C: not bitmap, but can be full since no zombies are inserted in that case // M: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_13 ( diff --git a/GraphBLAS/Source/GB_subassign_15.c b/GraphBLAS/Source/assign/GB_subassign_15.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_15.c rename to GraphBLAS/Source/assign/GB_subassign_15.c index 3afca9c2dd..fd371c030e 100644 --- a/GraphBLAS/Source/GB_subassign_15.c +++ b/GraphBLAS/Source/assign/GB_subassign_15.c @@ -21,8 +21,8 @@ // C: not bitmap, but can be full since no zombies are inserted in that case // M: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_15 ( diff --git a/GraphBLAS/Source/GB_subassign_17.c b/GraphBLAS/Source/assign/GB_subassign_17.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_17.c rename to GraphBLAS/Source/assign/GB_subassign_17.c index b8ae121801..ee5a11a18c 100644 --- a/GraphBLAS/Source/GB_subassign_17.c +++ b/GraphBLAS/Source/assign/GB_subassign_17.c @@ -21,8 +21,8 @@ // C: not bitmap // M: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_17 ( diff --git a/GraphBLAS/Source/GB_subassign_19.c b/GraphBLAS/Source/assign/GB_subassign_19.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_19.c rename to GraphBLAS/Source/assign/GB_subassign_19.c index f32c44920f..cd65347c6f 100644 --- a/GraphBLAS/Source/GB_subassign_19.c +++ b/GraphBLAS/Source/assign/GB_subassign_19.c @@ -21,8 +21,8 @@ // C: not bitmap // M: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" GrB_Info GB_subassign_19 ( diff --git a/GraphBLAS/Source/GB_subassign_22.c b/GraphBLAS/Source/assign/GB_subassign_22.c similarity index 94% rename from GraphBLAS/Source/GB_subassign_22.c rename to GraphBLAS/Source/assign/GB_subassign_22.c index c0212ca61d..7925d3a733 100644 --- a/GraphBLAS/Source/GB_subassign_22.c +++ b/GraphBLAS/Source/assign/GB_subassign_22.c @@ -21,13 +21,13 @@ // C += scalar where C is full -#include "GB_subassign_dense.h" -#include "GB_assign_shared_definitions.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "assign/GB_subassign_dense.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_aop__include.h" +#include "FactoryKernels/GB_aop__include.h" #endif #undef GB_FREE_ALL @@ -128,7 +128,7 @@ GrB_Info GB_subassign_22 // C += scalar where C is full accum, false, &opcode, &xcode, &ycode, &zcode)) { // accumulate sparse matrix into full matrix with built-in operator - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif @@ -160,7 +160,7 @@ GrB_Info GB_subassign_22 // C += scalar where C is full if (info == GrB_NO_VALUE) { - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (C, "(generic C(:,:)+=x assign) ") ; GxB_binary_function faccum = accum->binop_function ; @@ -170,7 +170,7 @@ GrB_Info GB_subassign_22 // C += scalar where C is full #define GB_ACCUMULATE_scalar(Cx,pC,ywork) \ faccum (Cx +((pC)*csize), Cx +((pC)*csize), ywork) - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_subassign_23.c b/GraphBLAS/Source/assign/GB_subassign_23.c similarity index 94% rename from GraphBLAS/Source/GB_subassign_23.c rename to GraphBLAS/Source/assign/GB_subassign_23.c index d7a4b8aef3..a1de0a395b 100644 --- a/GraphBLAS/Source/GB_subassign_23.c +++ b/GraphBLAS/Source/assign/GB_subassign_23.c @@ -26,14 +26,14 @@ // C and A can have any sparsity structure, but C must be as-if-full. -#include "GB_subassign_dense.h" -#include "GB_assign_shared_definitions.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "assign/GB_subassign_dense.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_aop__include.h" +#include "FactoryKernels/GB_aop__include.h" #endif -#include "GB_unused.h" +#include "include/GB_unused.h" #undef GB_FREE_ALL #define GB_FREE_ALL ; @@ -128,7 +128,7 @@ GrB_Info GB_subassign_23 // C += A; C is full accum, false, &opcode, &xcode, &ycode, &zcode)) { // accumulate sparse matrix into full matrix with built-in operator - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif @@ -159,7 +159,7 @@ GrB_Info GB_subassign_23 // C += A; C is full if (info == GrB_NO_VALUE) { - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (A, "(generic C+=A) ") ; GxB_binary_function faccum = accum->binop_function ; @@ -197,7 +197,7 @@ GrB_Info GB_subassign_23 // C += A; C is full } \ } - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_subassign_24.c b/GraphBLAS/Source/assign/GB_subassign_24.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_24.c rename to GraphBLAS/Source/assign/GB_subassign_24.c index 30c6356ab7..a860a7e057 100644 --- a/GraphBLAS/Source/GB_subassign_24.c +++ b/GraphBLAS/Source/assign/GB_subassign_24.c @@ -20,8 +20,8 @@ // A can be jumbled, in which case C is also jumbled. // A can have any sparsity structure (sparse, hyper, bitmap, or full). -#include "GB_subassign_dense.h" -#include "GB_Pending.h" +#include "assign/GB_subassign_dense.h" +#include "pending/GB_Pending.h" #define GB_FREE_ALL ; GrB_Info GB_subassign_24 // C = A, copy A into an existing matrix C diff --git a/GraphBLAS/Source/GB_subassign_25.c b/GraphBLAS/Source/assign/GB_subassign_25.c similarity index 95% rename from GraphBLAS/Source/GB_subassign_25.c rename to GraphBLAS/Source/assign/GB_subassign_25.c index dbfc9a7e3e..1bc03e2fbc 100644 --- a/GraphBLAS/Source/GB_subassign_25.c +++ b/GraphBLAS/Source/assign/GB_subassign_25.c @@ -27,12 +27,12 @@ // C is iso if A is iso -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subassign_dense.h" -#include "GB_stringify.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "assign/GB_subassign_dense.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_as__include.h" +#include "FactoryKernels/GB_as__include.h" #endif #undef GB_FREE_ALL @@ -119,7 +119,7 @@ GrB_Info GB_subassign_25 #define GB_ISO_ASSIGN GB_cast_scalar (C->x, ccode, A->x, acode, asize) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" info = GrB_SUCCESS ; } @@ -200,7 +200,7 @@ GrB_Info GB_subassign_25 if (info == GrB_NO_VALUE) { - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (A, "(generic C(:,:)=A assign, " "method 25) ") ; @@ -208,7 +208,7 @@ GrB_Info GB_subassign_25 GB_cast_function cast_A_to_C = GB_cast_factory (ccode, acode) ; #define C_iso false - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_subassign_IxJ_slice.c b/GraphBLAS/Source/assign/GB_subassign_IxJ_slice.c similarity index 99% rename from GraphBLAS/Source/GB_subassign_IxJ_slice.c rename to GraphBLAS/Source/assign/GB_subassign_IxJ_slice.c index b93f5de1af..a73dad4cb9 100644 --- a/GraphBLAS/Source/GB_subassign_IxJ_slice.c +++ b/GraphBLAS/Source/assign/GB_subassign_IxJ_slice.c @@ -43,7 +43,7 @@ // Instead, Methods 05 and 07 slice the matrix M, and Methods 09 and 11 slice // the matrix addition M+S. -#include "GB_subassign_methods.h" +#include "assign/GB_subassign_methods.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ diff --git a/GraphBLAS/Source/GB_subassign_IxJ_slice.h b/GraphBLAS/Source/assign/GB_subassign_IxJ_slice.h similarity index 100% rename from GraphBLAS/Source/GB_subassign_IxJ_slice.h rename to GraphBLAS/Source/assign/GB_subassign_IxJ_slice.h diff --git a/GraphBLAS/Source/GB_subassign_dense.h b/GraphBLAS/Source/assign/GB_subassign_dense.h similarity index 98% rename from GraphBLAS/Source/GB_subassign_dense.h rename to GraphBLAS/Source/assign/GB_subassign_dense.h index 70fc318f83..3486361708 100644 --- a/GraphBLAS/Source/GB_subassign_dense.h +++ b/GraphBLAS/Source/assign/GB_subassign_dense.h @@ -10,7 +10,7 @@ #ifndef GB_SUBASSIGN_DENSE_H #define GB_SUBASSIGN_DENSE_H -#include "GB_ek_slice.h" +#include "slice/GB_ek_slice.h" //------------------------------------------------------------------------------ // GB_subassign_23: C(:,:) += A where C is dense and A is sparse or dense diff --git a/GraphBLAS/Source/GB_subassign_methods.h b/GraphBLAS/Source/assign/GB_subassign_methods.h similarity index 99% rename from GraphBLAS/Source/GB_subassign_methods.h rename to GraphBLAS/Source/assign/GB_subassign_methods.h index d5dd02c4ef..2c28476c63 100644 --- a/GraphBLAS/Source/GB_subassign_methods.h +++ b/GraphBLAS/Source/assign/GB_subassign_methods.h @@ -10,11 +10,11 @@ #ifndef GB_SUBASSIGN_METHODS_H #define GB_SUBASSIGN_METHODS_H -#include "GB_add.h" -#include "GB_ij.h" -#include "GB_Pending.h" -#include "GB_subassign_IxJ_slice.h" -#include "GB_unused.h" +#include "ewise/GB_add.h" +#include "ij/GB_ij.h" +#include "pending/GB_Pending.h" +#include "assign/GB_subassign_IxJ_slice.h" +#include "include/GB_unused.h" //------------------------------------------------------------------------------ // GB_subassign_symbolic: S = C(I,J) diff --git a/GraphBLAS/Source/GB_subassign_one_slice.c b/GraphBLAS/Source/assign/GB_subassign_one_slice.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_one_slice.c rename to GraphBLAS/Source/assign/GB_subassign_one_slice.c index 1f597d3928..8bc90a23b0 100644 --- a/GraphBLAS/Source/GB_subassign_one_slice.c +++ b/GraphBLAS/Source/assign/GB_subassign_one_slice.c @@ -25,8 +25,8 @@ // C: not bitmap -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_WORKSPACE #define GB_FREE_WORKSPACE \ @@ -166,7 +166,7 @@ GrB_Info GB_subassign_one_slice GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (Coarse, Mp, mnvec, ntasks1, false) ; + GB_p_slice (Coarse, Mp, mnvec, ntasks1, false) ; //-------------------------------------------------------------------------- // construct all tasks, both coarse and fine diff --git a/GraphBLAS/Source/GB_subassign_scalar.c b/GraphBLAS/Source/assign/GB_subassign_scalar.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_scalar.c rename to GraphBLAS/Source/assign/GB_subassign_scalar.c index d382647ae4..9822374edb 100644 --- a/GraphBLAS/Source/GB_subassign_scalar.c +++ b/GraphBLAS/Source/assign/GB_subassign_scalar.c @@ -17,8 +17,8 @@ // Compare with GB_assign_scalar, which uses M and C_replace differently -#include "GB_subassign.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "mask/GB_get_mask.h" GrB_Info GB_subassign_scalar // C(Rows,Cols) += x ( diff --git a/GraphBLAS/Source/GB_subassign_symbolic.c b/GraphBLAS/Source/assign/GB_subassign_symbolic.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_symbolic.c rename to GraphBLAS/Source/assign/GB_subassign_symbolic.c index e013bdaa57..78945e0d5d 100644 --- a/GraphBLAS/Source/GB_subassign_symbolic.c +++ b/GraphBLAS/Source/assign/GB_subassign_symbolic.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" -#include "GB_subref.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" +#include "extract/GB_subref.h" #undef GB_FREE_ALL #define GB_FREE_ALL GB_phybix_free (S) ; diff --git a/GraphBLAS/Source/GB_subassign_zombie.c b/GraphBLAS/Source/assign/GB_subassign_zombie.c similarity index 96% rename from GraphBLAS/Source/GB_subassign_zombie.c rename to GraphBLAS/Source/assign/GB_subassign_zombie.c index 186ccf6323..24d516da48 100644 --- a/GraphBLAS/Source/GB_subassign_zombie.c +++ b/GraphBLAS/Source/assign/GB_subassign_zombie.c @@ -22,12 +22,12 @@ // C->iso is not affected. -#include "GB_subassign_methods.h" -#include "GB_assign_shared_definitions.h" +#include "assign/GB_subassign_methods.h" +#include "assign/include/GB_assign_shared_definitions.h" #undef GB_FREE_ALL #define GB_FREE_ALL GB_Matrix_free (&S) ; -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GB_subassign_zombie ( diff --git a/GraphBLAS/Source/GB_subassigner.c b/GraphBLAS/Source/assign/GB_subassigner.c similarity index 99% rename from GraphBLAS/Source/GB_subassigner.c rename to GraphBLAS/Source/assign/GB_subassigner.c index 45038d1d8d..0a936cb686 100644 --- a/GraphBLAS/Source/GB_subassigner.c +++ b/GraphBLAS/Source/assign/GB_subassigner.c @@ -55,10 +55,10 @@ // C->x and C->iso have already been computed if C is iso on output, by // GB_assign_prep, so if C->iso is true, there is no numeric work to do. -#include "GB_subassign.h" -#include "GB_subassign_methods.h" -#include "GB_subassign_dense.h" -#include "GB_bitmap_assign.h" +#include "assign/GB_subassign.h" +#include "assign/GB_subassign_methods.h" +#include "assign/GB_subassign_dense.h" +#include "assign/GB_bitmap_assign.h" #undef GB_FREE_ALL #define GB_FREE_ALL GB_phybix_free (C) ; diff --git a/GraphBLAS/Source/GB_subassigner_method.c b/GraphBLAS/Source/assign/GB_subassigner_method.c similarity index 99% rename from GraphBLAS/Source/GB_subassigner_method.c rename to GraphBLAS/Source/assign/GB_subassigner_method.c index f042752e07..b81e802e1e 100644 --- a/GraphBLAS/Source/GB_subassigner_method.c +++ b/GraphBLAS/Source/assign/GB_subassigner_method.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_subassign.h" +#include "assign/GB_subassign.h" int GB_subassigner_method // return method to use in GB_subassigner ( diff --git a/GraphBLAS/Source/GrB_Col_assign.c b/GraphBLAS/Source/assign/GrB_Col_assign.c similarity index 96% rename from GraphBLAS/Source/GrB_Col_assign.c rename to GraphBLAS/Source/assign/GrB_Col_assign.c index 445d89a3e2..a01247ca1c 100644 --- a/GraphBLAS/Source/GrB_Col_assign.c +++ b/GraphBLAS/Source/assign/GrB_Col_assign.c @@ -9,9 +9,9 @@ // Compare with GxB_Col_subassign, which uses the M and C_replace differently -#include "GB_assign.h" -#include "GB_bitmap_assign.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "assign/GB_bitmap_assign.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Col_assign // C(Rows,col) = accum (C(Rows,col),u) ( diff --git a/GraphBLAS/Source/GrB_Matrix_assign.c b/GraphBLAS/Source/assign/GrB_Matrix_assign.c similarity index 96% rename from GraphBLAS/Source/GrB_Matrix_assign.c rename to GraphBLAS/Source/assign/GrB_Matrix_assign.c index 3b6c4b6aa4..7f5de36b0e 100644 --- a/GraphBLAS/Source/GrB_Matrix_assign.c +++ b/GraphBLAS/Source/assign/GrB_Matrix_assign.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_assign.h" -#include "GB_bitmap_assign.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "assign/GB_bitmap_assign.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Matrix_assign // C(Rows,Cols) += A or A' ( diff --git a/GraphBLAS/Source/GrB_Matrix_assign_scalar.c b/GraphBLAS/Source/assign/GrB_Matrix_assign_scalar.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_assign_scalar.c rename to GraphBLAS/Source/assign/GrB_Matrix_assign_scalar.c index 7d7924ddd7..003e75ba27 100644 --- a/GraphBLAS/Source/GrB_Matrix_assign_scalar.c +++ b/GraphBLAS/Source/assign/GrB_Matrix_assign_scalar.c @@ -20,9 +20,9 @@ // The actual work is done in GB_assign_scalar.c. #define GB_FREE_ALL ; -#include "GB_assign.h" -#include "GB_ij.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "ij/GB_ij.h" +#include "mask/GB_get_mask.h" #define GB_ASSIGN_SCALAR(prefix,type,T,ampersand) \ GrB_Info GB_EVAL3 (prefix, _Matrix_assign_, T) /* C(Rows,Cols) += x */ \ @@ -78,7 +78,7 @@ GB_ASSIGN_SCALAR (GrB, void * , UDT , ) #undef GB_FREE_ALL #define GB_FREE_ALL GB_Matrix_free (&S) ; -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GrB_Matrix_assign_Scalar // C(I,J) = accum (C(I,J),s) ( diff --git a/GraphBLAS/Source/GrB_Row_assign.c b/GraphBLAS/Source/assign/GrB_Row_assign.c similarity index 96% rename from GraphBLAS/Source/GrB_Row_assign.c rename to GraphBLAS/Source/assign/GrB_Row_assign.c index 2d087c3f19..bb41480f4c 100644 --- a/GraphBLAS/Source/GrB_Row_assign.c +++ b/GraphBLAS/Source/assign/GrB_Row_assign.c @@ -9,9 +9,9 @@ // Compare with GxB_Row_subassign, which uses M and C_replace differently -#include "GB_assign.h" -#include "GB_bitmap_assign.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "assign/GB_bitmap_assign.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Row_assign // C(row,Cols) += u' ( diff --git a/GraphBLAS/Source/GrB_Vector_assign.c b/GraphBLAS/Source/assign/GrB_Vector_assign.c similarity index 96% rename from GraphBLAS/Source/GrB_Vector_assign.c rename to GraphBLAS/Source/assign/GrB_Vector_assign.c index 31d96326d1..eee523b360 100644 --- a/GraphBLAS/Source/GrB_Vector_assign.c +++ b/GraphBLAS/Source/assign/GrB_Vector_assign.c @@ -9,9 +9,9 @@ // Compare with GxB_Vector_subassign, which uses M and C_replace differently -#include "GB_assign.h" -#include "GB_bitmap_assign.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "assign/GB_bitmap_assign.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Vector_assign // w(Rows) = accum (w(Rows),u) ( diff --git a/GraphBLAS/Source/GrB_Vector_assign_scalar.c b/GraphBLAS/Source/assign/GrB_Vector_assign_scalar.c similarity index 98% rename from GraphBLAS/Source/GrB_Vector_assign_scalar.c rename to GraphBLAS/Source/assign/GrB_Vector_assign_scalar.c index 14eef2d4cb..33ff589375 100644 --- a/GraphBLAS/Source/GrB_Vector_assign_scalar.c +++ b/GraphBLAS/Source/assign/GrB_Vector_assign_scalar.c @@ -12,9 +12,9 @@ // with each entry in u equal to x. #define GB_FREE_ALL ; -#include "GB_assign.h" -#include "GB_ij.h" -#include "GB_get_mask.h" +#include "assign/GB_assign.h" +#include "ij/GB_ij.h" +#include "mask/GB_get_mask.h" #define GB_ASSIGN_SCALAR(prefix,type,T,ampersand) \ GrB_Info GB_EVAL3 (prefix, _Vector_assign_, T) /* w(Rows)=accum(w(Rows),x)*/\ @@ -70,7 +70,7 @@ GB_ASSIGN_SCALAR (GrB, void * , UDT , ) #undef GB_FREE_ALL #define GB_FREE_ALL GB_Matrix_free (&S) ; -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GrB_Vector_assign_Scalar // w(I) = accum (w(I),s) ( diff --git a/GraphBLAS/Source/GxB_Col_subassign.c b/GraphBLAS/Source/assign/GxB_Col_subassign.c similarity index 97% rename from GraphBLAS/Source/GxB_Col_subassign.c rename to GraphBLAS/Source/assign/GxB_Col_subassign.c index d4f687c86f..71e893b2c8 100644 --- a/GraphBLAS/Source/GxB_Col_subassign.c +++ b/GraphBLAS/Source/assign/GxB_Col_subassign.c @@ -9,8 +9,8 @@ // Compare with GrB_Col_assign, which uses M and C_replace differently -#include "GB_subassign.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "mask/GB_get_mask.h" GrB_Info GxB_Col_subassign // C(Rows,col) = accum (C(Rows,col),u) ( diff --git a/GraphBLAS/Source/GxB_Matrix_subassign.c b/GraphBLAS/Source/assign/GxB_Matrix_subassign.c similarity index 97% rename from GraphBLAS/Source/GxB_Matrix_subassign.c rename to GraphBLAS/Source/assign/GxB_Matrix_subassign.c index fd9d9b33b3..dee56b231d 100644 --- a/GraphBLAS/Source/GxB_Matrix_subassign.c +++ b/GraphBLAS/Source/assign/GxB_Matrix_subassign.c @@ -9,8 +9,8 @@ // Compare with GrB_Matrix_assign, which uses M and C_replace differently -#include "GB_subassign.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "mask/GB_get_mask.h" GrB_Info GxB_Matrix_subassign // C(Rows,Cols) += A or A' ( diff --git a/GraphBLAS/Source/GxB_Matrix_subassign_scalar.c b/GraphBLAS/Source/assign/GxB_Matrix_subassign_scalar.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_subassign_scalar.c rename to GraphBLAS/Source/assign/GxB_Matrix_subassign_scalar.c index 3dfea76704..79edc1468a 100644 --- a/GraphBLAS/Source/GxB_Matrix_subassign_scalar.c +++ b/GraphBLAS/Source/assign/GxB_Matrix_subassign_scalar.c @@ -18,9 +18,9 @@ // which uses M and C_Replace differently. #define GB_FREE_ALL ; -#include "GB_subassign.h" -#include "GB_ij.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "ij/GB_ij.h" +#include "mask/GB_get_mask.h" #define GB_ASSIGN_SCALAR(type,T,ampersand) \ GrB_Info GB_EVAL2 (GXB (Matrix_subassign_), T) /* C(Rows,Cols) += x */ \ @@ -76,7 +76,7 @@ GB_ASSIGN_SCALAR (void * , UDT , ) #undef GB_FREE_ALL #define GB_FREE_ALL GB_Matrix_free (&S) ; -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GxB_Matrix_subassign_Scalar // C(I,J) = accum (C(I,J),s) ( diff --git a/GraphBLAS/Source/GxB_Row_subassign.c b/GraphBLAS/Source/assign/GxB_Row_subassign.c similarity index 97% rename from GraphBLAS/Source/GxB_Row_subassign.c rename to GraphBLAS/Source/assign/GxB_Row_subassign.c index 381b304423..1f62f5c194 100644 --- a/GraphBLAS/Source/GxB_Row_subassign.c +++ b/GraphBLAS/Source/assign/GxB_Row_subassign.c @@ -9,8 +9,8 @@ // Compare with GrB_Row_assign, which uses the M and C_replace differently -#include "GB_subassign.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "mask/GB_get_mask.h" GrB_Info GxB_Row_subassign // C(row,Cols) += u' ( diff --git a/GraphBLAS/Source/GxB_Vector_subassign.c b/GraphBLAS/Source/assign/GxB_Vector_subassign.c similarity index 97% rename from GraphBLAS/Source/GxB_Vector_subassign.c rename to GraphBLAS/Source/assign/GxB_Vector_subassign.c index 1d12262ed8..a85f203c07 100644 --- a/GraphBLAS/Source/GxB_Vector_subassign.c +++ b/GraphBLAS/Source/assign/GxB_Vector_subassign.c @@ -9,8 +9,8 @@ // Compare with GrB_Vector_assign, which uses M and C_replace differently -#include "GB_subassign.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "mask/GB_get_mask.h" GrB_Info GxB_Vector_subassign // w(Rows) = accum (w(Rows),u) ( diff --git a/GraphBLAS/Source/GxB_Vector_subassign_scalar.c b/GraphBLAS/Source/assign/GxB_Vector_subassign_scalar.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_subassign_scalar.c rename to GraphBLAS/Source/assign/GxB_Vector_subassign_scalar.c index 1e22ed2144..f93d3d0acd 100644 --- a/GraphBLAS/Source/GxB_Vector_subassign_scalar.c +++ b/GraphBLAS/Source/assign/GxB_Vector_subassign_scalar.c @@ -14,9 +14,9 @@ // The actual work is done in GB_subassign_scalar.c. #define GB_FREE_ALL ; -#include "GB_subassign.h" -#include "GB_ij.h" -#include "GB_get_mask.h" +#include "assign/GB_subassign.h" +#include "ij/GB_ij.h" +#include "mask/GB_get_mask.h" #define GB_ASSIGN_SCALAR(type,T,ampersand) \ GrB_Info GB_EVAL2 (GXB (Vector_subassign_), T) /* w(I) = accum (w(I),x) */ \ @@ -73,7 +73,7 @@ GB_ASSIGN_SCALAR (void * , UDT , ) #undef GB_FREE_ALL #define GB_FREE_ALL GB_Matrix_free (&S) ; -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GxB_Vector_subassign_Scalar // w(I) = accum (w(I),s) ( diff --git a/GraphBLAS/Source/dodiff b/GraphBLAS/Source/assign/dodiff similarity index 100% rename from GraphBLAS/Source/dodiff rename to GraphBLAS/Source/assign/dodiff diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_A_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_A_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_A_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_A_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_A_whole_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_A_whole_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_A_whole_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_A_whole_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_C_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_C_template.c similarity index 96% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_C_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_C_template.c index 263d67223e..264f761457 100644 --- a/GraphBLAS/Source/Factories/GB_bitmap_assign_C_template.c +++ b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_C_template.c @@ -86,7 +86,7 @@ case GB_ASSIGN : { // iterate over all of C(:,:). - #include "GB_bitmap_assign_C_whole_template.c" + #include "assign/factory/GB_bitmap_assign_C_whole_template.c" } break ; #endif @@ -105,7 +105,7 @@ GB_GET_MIJ (mij, pA) ; /* mij = Mask (pA) */ \ GB_CIJ_WORK (pC) ; /* operate on C(iC,jC) */ \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } break ; #endif diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_C_whole_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_C_whole_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_C_whole_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_C_whole_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_IxJ_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_IxJ_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_IxJ_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_IxJ_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_M_all_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_all_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_M_all_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_all_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_M_col_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_col_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_M_col_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_col_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_M_row_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_row_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_M_row_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_row_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_M_sub_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_sub_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_M_sub_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_sub_template.c diff --git a/GraphBLAS/Source/Factories/GB_bitmap_assign_M_template.c b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_template.c similarity index 86% rename from GraphBLAS/Source/Factories/GB_bitmap_assign_M_template.c rename to GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_template.c index 0fe57f2378..a1a63e19ad 100644 --- a/GraphBLAS/Source/Factories/GB_bitmap_assign_M_template.c +++ b/GraphBLAS/Source/assign/factory/GB_bitmap_assign_M_template.c @@ -27,20 +27,20 @@ switch (assign_kind) { case GB_ROW_ASSIGN : // row assignment: C(iC,J), where M is a row vector - #include "GB_bitmap_assign_M_row_template.c" + #include "assign/factory/GB_bitmap_assign_M_row_template.c" break ; case GB_COL_ASSIGN : // column assignment: C(I,jC), where M is a column vector - #include "GB_bitmap_assign_M_col_template.c" + #include "assign/factory/GB_bitmap_assign_M_col_template.c" break ; case GB_ASSIGN : // GrB_assign: C(I,J), where M is the same size as C - #include "GB_bitmap_assign_M_all_template.c" + #include "assign/factory/GB_bitmap_assign_M_all_template.c" break ; #ifndef GB_NO_SUBASSIGN_CASE case GB_SUBASSIGN : // GxB_subassign: C(I,J), where M is the same size as C(I,J) and A - #include "GB_bitmap_assign_M_sub_template.c" + #include "assign/factory/GB_bitmap_assign_M_sub_template.c" break ; #endif default: ; diff --git a/GraphBLAS/Source/Shared/GB_assign_shared_definitions.h b/GraphBLAS/Source/assign/include/GB_assign_shared_definitions.h similarity index 99% rename from GraphBLAS/Source/Shared/GB_assign_shared_definitions.h rename to GraphBLAS/Source/assign/include/GB_assign_shared_definitions.h index ae5ff10df6..94e8e5670c 100644 --- a/GraphBLAS/Source/Shared/GB_assign_shared_definitions.h +++ b/GraphBLAS/Source/assign/include/GB_assign_shared_definitions.h @@ -9,7 +9,7 @@ // macros for the construction of the GB_subassign kernels -#include "GB_kernel_shared_definitions.h" +#include "include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // definitions redefined as needed diff --git a/GraphBLAS/Source/Template/GB_bitmap_scatter.h b/GraphBLAS/Source/assign/include/GB_bitmap_scatter.h similarity index 100% rename from GraphBLAS/Source/Template/GB_bitmap_scatter.h rename to GraphBLAS/Source/assign/include/GB_bitmap_scatter.h diff --git a/GraphBLAS/Source/Shared/GB_index.h b/GraphBLAS/Source/assign/include/GB_index.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_index.h rename to GraphBLAS/Source/assign/include/GB_index.h diff --git a/GraphBLAS/Source/Template/GB_subassign_05d_template.c b/GraphBLAS/Source/assign/template/GB_subassign_05d_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_subassign_05d_template.c rename to GraphBLAS/Source/assign/template/GB_subassign_05d_template.c diff --git a/GraphBLAS/Source/Template/GB_subassign_06d_template.c b/GraphBLAS/Source/assign/template/GB_subassign_06d_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_subassign_06d_template.c rename to GraphBLAS/Source/assign/template/GB_subassign_06d_template.c index 940829c08c..db5b4cb6b5 100644 --- a/GraphBLAS/Source/Template/GB_subassign_06d_template.c +++ b/GraphBLAS/Source/assign/template/GB_subassign_06d_template.c @@ -102,7 +102,7 @@ int64_t cnvals = C->nvals ; // for C bitmap - // future:: divide this Templates into sub-Templates (Mask_struct, etc) + // future:: divide this template into sub-template (Mask_struct, etc) if (Mask_struct) { diff --git a/GraphBLAS/Source/Template/GB_subassign_22_template.c b/GraphBLAS/Source/assign/template/GB_subassign_22_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_subassign_22_template.c rename to GraphBLAS/Source/assign/template/GB_subassign_22_template.c diff --git a/GraphBLAS/Source/Template/GB_subassign_23_template.c b/GraphBLAS/Source/assign/template/GB_subassign_23_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_subassign_23_template.c rename to GraphBLAS/Source/assign/template/GB_subassign_23_template.c index 6205b53408..6c1eabbc92 100644 --- a/GraphBLAS/Source/Template/GB_subassign_23_template.c +++ b/GraphBLAS/Source/assign/template/GB_subassign_23_template.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_unused.h" +#include "include/GB_unused.h" #undef GB_FREE_ALL #define GB_FREE_ALL \ diff --git a/GraphBLAS/Source/Template/GB_subassign_25_template.c b/GraphBLAS/Source/assign/template/GB_subassign_25_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_subassign_25_template.c rename to GraphBLAS/Source/assign/template/GB_subassign_25_template.c diff --git a/GraphBLAS/Source/GB_binop.h b/GraphBLAS/Source/binaryop/GB_binop.h similarity index 100% rename from GraphBLAS/Source/GB_binop.h rename to GraphBLAS/Source/binaryop/GB_binop.h diff --git a/GraphBLAS/Source/GB_binop_builtin.c b/GraphBLAS/Source/binaryop/GB_binop_builtin.c similarity index 98% rename from GraphBLAS/Source/GB_binop_builtin.c rename to GraphBLAS/Source/binaryop/GB_binop_builtin.c index 0980c6c265..07526d604e 100644 --- a/GraphBLAS/Source/GB_binop_builtin.c +++ b/GraphBLAS/Source/binaryop/GB_binop_builtin.c @@ -18,8 +18,8 @@ // operator, as needed. #include "GB.h" -#include "GB_binop.h" -#include "GB_unused.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" bool GB_binop_builtin // true if binary operator is builtin ( diff --git a/GraphBLAS/Source/GB_binop_new.c b/GraphBLAS/Source/binaryop/GB_binop_new.c similarity index 98% rename from GraphBLAS/Source/GB_binop_new.c rename to GraphBLAS/Source/binaryop/GB_binop_new.c index 3860ebb6b4..d970ac9b7f 100644 --- a/GraphBLAS/Source/GB_binop_new.c +++ b/GraphBLAS/Source/binaryop/GB_binop_new.c @@ -15,7 +15,7 @@ // uninitialized. #include "GB.h" -#include "GB_binop.h" +#include "binaryop/GB_binop.h" GrB_Info GB_binop_new ( diff --git a/GraphBLAS/Source/GB_binop_pattern.c b/GraphBLAS/Source/binaryop/GB_binop_pattern.c similarity index 98% rename from GraphBLAS/Source/GB_binop_pattern.c rename to GraphBLAS/Source/binaryop/GB_binop_pattern.c index 01daf68405..459750fd0b 100644 --- a/GraphBLAS/Source/GB_binop_pattern.c +++ b/GraphBLAS/Source/binaryop/GB_binop_pattern.c @@ -12,7 +12,7 @@ // operator for C=A*B, or the ewise operator for eWiseMult. #include "GB.h" -#include "GB_binop.h" +#include "binaryop/GB_binop.h" void GB_binop_pattern ( diff --git a/GraphBLAS/Source/GB_binop_rename.c b/GraphBLAS/Source/binaryop/GB_binop_rename.c similarity index 99% rename from GraphBLAS/Source/GB_binop_rename.c rename to GraphBLAS/Source/binaryop/GB_binop_rename.c index 14133f6beb..ffbc5e2702 100644 --- a/GraphBLAS/Source/GB_binop_rename.c +++ b/GraphBLAS/Source/binaryop/GB_binop_rename.c @@ -12,8 +12,8 @@ // be applied, and some of them can be remapped into binary ops (with bind2nd). #include "GB.h" -#include "GB_binop.h" -#include "GB_unop.h" +#include "binaryop/GB_binop.h" +#include "unaryop/GB_unop.h" void GB_binop_rename // rename a bound binary op or an idxunop ( diff --git a/GraphBLAS/Source/GB_binop_second.c b/GraphBLAS/Source/binaryop/GB_binop_second.c similarity index 97% rename from GraphBLAS/Source/GB_binop_second.c rename to GraphBLAS/Source/binaryop/GB_binop_second.c index 6c76996f53..a03bf1619a 100644 --- a/GraphBLAS/Source/GB_binop_second.c +++ b/GraphBLAS/Source/binaryop/GB_binop_second.c @@ -8,8 +8,8 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_binop.h" -#include "GB_unused.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" GrB_BinaryOp GB_binop_second // return SECOND operator, or NULL on error ( diff --git a/GraphBLAS/Source/GB_binop_to_monoid.c b/GraphBLAS/Source/binaryop/GB_binop_to_monoid.c similarity index 99% rename from GraphBLAS/Source/GB_binop_to_monoid.c rename to GraphBLAS/Source/binaryop/GB_binop_to_monoid.c index 6cf3f0a1fe..aeca0225f8 100644 --- a/GraphBLAS/Source/GB_binop_to_monoid.c +++ b/GraphBLAS/Source/binaryop/GB_binop_to_monoid.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_binop.h" +#include "binaryop/GB_binop.h" GrB_Monoid GB_binop_to_monoid // return the corresponding monoid, or NULL ( diff --git a/GraphBLAS/Source/GB_boolean_rename.c b/GraphBLAS/Source/binaryop/GB_boolean_rename.c similarity index 99% rename from GraphBLAS/Source/GB_boolean_rename.c rename to GraphBLAS/Source/binaryop/GB_boolean_rename.c index 9d7548a886..d0a5651b7f 100644 --- a/GraphBLAS/Source/GB_boolean_rename.c +++ b/GraphBLAS/Source/binaryop/GB_boolean_rename.c @@ -34,7 +34,7 @@ // is 1/x, is simply 'true' for all x. #include "GB.h" -#include "GB_binop.h" +#include "binaryop/GB_binop.h" GB_Opcode GB_boolean_rename // renamed opcode ( diff --git a/GraphBLAS/Source/GB_boolean_rename_op.c b/GraphBLAS/Source/binaryop/GB_boolean_rename_op.c similarity index 98% rename from GraphBLAS/Source/GB_boolean_rename_op.c rename to GraphBLAS/Source/binaryop/GB_boolean_rename_op.c index 6399ae15eb..ff3b336def 100644 --- a/GraphBLAS/Source/GB_boolean_rename_op.c +++ b/GraphBLAS/Source/binaryop/GB_boolean_rename_op.c @@ -14,7 +14,7 @@ // reflect the renaming. #include "GB.h" -#include "GB_binop.h" +#include "binaryop/GB_binop.h" GrB_BinaryOp GB_boolean_rename_op // return renamed op ( diff --git a/GraphBLAS/Source/GB_flip_binop.c b/GraphBLAS/Source/binaryop/GB_flip_binop.c similarity index 99% rename from GraphBLAS/Source/GB_flip_binop.c rename to GraphBLAS/Source/binaryop/GB_flip_binop.c index 783709af86..a6730e1a6e 100644 --- a/GraphBLAS/Source/GB_flip_binop.c +++ b/GraphBLAS/Source/binaryop/GB_flip_binop.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_binop.h" +#include "binaryop/GB_binop.h" GrB_BinaryOp GB_flip_binop // flip a binary operator ( diff --git a/GraphBLAS/Source/GrB_BinaryOp_free.c b/GraphBLAS/Source/binaryop/GrB_BinaryOp_free.c similarity index 100% rename from GraphBLAS/Source/GrB_BinaryOp_free.c rename to GraphBLAS/Source/binaryop/GrB_BinaryOp_free.c diff --git a/GraphBLAS/Source/GrB_BinaryOp_new.c b/GraphBLAS/Source/binaryop/GrB_BinaryOp_new.c similarity index 100% rename from GraphBLAS/Source/GrB_BinaryOp_new.c rename to GraphBLAS/Source/binaryop/GrB_BinaryOp_new.c diff --git a/GraphBLAS/Source/GxB_BinaryOp_new.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_new.c similarity index 98% rename from GraphBLAS/Source/GxB_BinaryOp_new.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_new.c index 6b2866810f..f66b7d9724 100644 --- a/GraphBLAS/Source/GxB_BinaryOp_new.c +++ b/GraphBLAS/Source/binaryop/GxB_BinaryOp_new.c @@ -14,8 +14,8 @@ // If the function pointer is NULL, the function is compiled with the JIT. #include "GB.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" GrB_Info GxB_BinaryOp_new ( diff --git a/GraphBLAS/Source/GxB_BinaryOp_xtype.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_xtype.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_xtype.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_xtype.c diff --git a/GraphBLAS/Source/GxB_BinaryOp_xtype_name.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_xtype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_xtype_name.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_xtype_name.c diff --git a/GraphBLAS/Source/GxB_BinaryOp_ytype.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_ytype.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_ytype.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_ytype.c diff --git a/GraphBLAS/Source/GxB_BinaryOp_ytype_name.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_ytype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_ytype_name.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_ytype_name.c diff --git a/GraphBLAS/Source/GxB_BinaryOp_ztype.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_ztype.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_ztype.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_ztype.c diff --git a/GraphBLAS/Source/GxB_BinaryOp_ztype_name.c b/GraphBLAS/Source/binaryop/GxB_BinaryOp_ztype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_ztype_name.c rename to GraphBLAS/Source/binaryop/GxB_BinaryOp_ztype_name.c diff --git a/GraphBLAS/Source/Factories/GB_binop_factory.c b/GraphBLAS/Source/binaryop/factory/GB_binop_factory.c similarity index 99% rename from GraphBLAS/Source/Factories/GB_binop_factory.c rename to GraphBLAS/Source/binaryop/factory/GB_binop_factory.c index 373a21b978..21b2e77145 100644 --- a/GraphBLAS/Source/Factories/GB_binop_factory.c +++ b/GraphBLAS/Source/binaryop/factory/GB_binop_factory.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_binop_factory: switch factory for built-in methods for C=binop(A,B) +// GB_binop_factory.c: switch factory for built-in methods for C=binop(A,B) //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. diff --git a/GraphBLAS/Source/GB_build.c b/GraphBLAS/Source/builder/GB_build.c similarity index 98% rename from GraphBLAS/Source/GB_build.c rename to GraphBLAS/Source/builder/GB_build.c index fc417e2cd9..37a3f6e9da 100644 --- a/GraphBLAS/Source/GB_build.c +++ b/GraphBLAS/Source/builder/GB_build.c @@ -95,7 +95,7 @@ // The input arrays I, J, and X are not modified. #define GB_FREE_ALL GrB_Matrix_free (&T) ; -#include "GB_build.h" +#include "builder/GB_build.h" GrB_Info GB_build // build matrix ( @@ -321,10 +321,10 @@ GrB_Info GB_build // build matrix // created an iso-valued matrix T, but this is not yet known. X_iso is // false for these methods. Since it has not yet been conformed to its // final sparsity structure, the matrix T is hypersparse, not bitmap. It - // has no zombies or pending tuples, so GB_check_if_iso does need to handle + // has no zombies or pending tuples, so GB_all_entries_are_iso does need to handle // those cases. T->x [0] is the new iso value of T. - if (!X_iso && GB_check_if_iso (T)) + if (!X_iso && GB_all_entries_are_iso (T)) { // All entries in T are the same; convert T to iso GBURBLE ("(post iso) ") ; diff --git a/GraphBLAS/Source/GB_build.h b/GraphBLAS/Source/builder/GB_build.h similarity index 100% rename from GraphBLAS/Source/GB_build.h rename to GraphBLAS/Source/builder/GB_build.h diff --git a/GraphBLAS/Source/GB_builder.c b/GraphBLAS/Source/builder/GB_builder.c similarity index 98% rename from GraphBLAS/Source/GB_builder.c rename to GraphBLAS/Source/builder/GB_builder.c index 976dc85359..65d989be26 100644 --- a/GraphBLAS/Source/GB_builder.c +++ b/GraphBLAS/Source/builder/GB_builder.c @@ -105,12 +105,12 @@ // This method always returns T as hypersparse, and T is iso if and only if Sx // is iso. -#include "GB_build.h" -#include "GB_sort.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "builder/GB_build.h" +#include "sort/GB_sort.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_bld__include.h" +#include "FactoryKernels/GB_bld__include.h" #endif #define GB_I_WORK(t) (((t) < 0) ? -1 : I_work [t]) @@ -246,7 +246,7 @@ GrB_Info GB_builder // build a matrix from tuples // Each thread handles about the same number of tuples. This partition // depends only on nvals. - GB_eslice (tstart_slice, nvals, nthreads) ; + GB_e_slice (tstart_slice, nvals, nthreads) ; // tstart_slice [tid]: first tuple in slice tid // tnvec_slice [tid]: # of vectors that start in a slice. If a vector @@ -1204,7 +1204,7 @@ GrB_Info GB_builder // build a matrix from tuples // T and Sx are iso; set iso value and delete duplicates memcpy (Tx, Sx, tsize) ; #define GB_ISO_BUILD - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" info = GrB_SUCCESS ; } @@ -1246,7 +1246,7 @@ GrB_Info GB_builder // build a matrix from tuples { opcode = GB_boolean_rename (opcode) ; } - #include "GB_bld_factory.c" + #include "builder/factory/GB_bld_factory.c" } #endif } @@ -1294,7 +1294,7 @@ GrB_Info GB_builder // build a matrix from tuples // Tx [p] += (ttype) Sx [k], but 2nd op and no typecasting #undef GB_BLD_DUP #define GB_BLD_DUP(Tx,p,Sx,k) GB_BLD_COPY(Tx,p,Sx,k) - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" } else @@ -1308,7 +1308,7 @@ GrB_Info GB_builder // build a matrix from tuples #undef GB_BLD_DUP #define GB_BLD_DUP(Tx,p,Sx,k) \ fdup (Tx +((p)*tsize), Tx +((p)*tsize), Sx+((k)*tsize)); - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" } info = GrB_SUCCESS ; @@ -1383,7 +1383,7 @@ GrB_Info GB_builder // build a matrix from tuples // Tx [p] += (ttype) Sx [k], but 2nd op, with typecasting #undef GB_BLD_DUP #define GB_BLD_DUP(Tx,p,Sx,k) GB_BLD_COPY(Tx,p,Sx,k) - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" } else @@ -1410,7 +1410,7 @@ GrB_Info GB_builder // build a matrix from tuples cast_Z_to_T (Tx +((p)*tsize), zwork, zsize) ; \ } - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" } } diff --git a/GraphBLAS/Source/GB_hyper_hash_build.c b/GraphBLAS/Source/builder/GB_hyper_hash_build.c similarity index 99% rename from GraphBLAS/Source/GB_hyper_hash_build.c rename to GraphBLAS/Source/builder/GB_hyper_hash_build.c index 78e9946ccc..d9576f59fe 100644 --- a/GraphBLAS/Source/GB_hyper_hash_build.c +++ b/GraphBLAS/Source/builder/GB_hyper_hash_build.c @@ -22,7 +22,7 @@ GB_phybix_free (A) ; \ } -#include "GB_build.h" +#include "builder/GB_build.h" GrB_Info GB_hyper_hash_build // construct A->Y if not already constructed ( diff --git a/GraphBLAS/Source/GrB_Matrix_build.c b/GraphBLAS/Source/builder/GrB_Matrix_build.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_build.c rename to GraphBLAS/Source/builder/GrB_Matrix_build.c index b0d72714e4..18a736189d 100644 --- a/GraphBLAS/Source/GrB_Matrix_build.c +++ b/GraphBLAS/Source/builder/GrB_Matrix_build.c @@ -12,7 +12,7 @@ // If dup is a valid binary operator, it is used to reduce any duplicates to // a single value. -#include "GB_build.h" +#include "builder/GB_build.h" #define GB_MATRIX_BUILD(prefix,type,T,xtype) \ GrB_Info GB_EVAL3 (prefix, _Matrix_build_, T) /* build a matrix from tuples */\ diff --git a/GraphBLAS/Source/GrB_Vector_build.c b/GraphBLAS/Source/builder/GrB_Vector_build.c similarity index 98% rename from GraphBLAS/Source/GrB_Vector_build.c rename to GraphBLAS/Source/builder/GrB_Vector_build.c index 776f962ebc..811c040db7 100644 --- a/GraphBLAS/Source/GrB_Vector_build.c +++ b/GraphBLAS/Source/builder/GrB_Vector_build.c @@ -12,7 +12,7 @@ // If dup is a valid binary operator, it is used to reduce any duplicates to // a single value. -#include "GB_build.h" +#include "builder/GB_build.h" #define GB_VECTOR_BUILD(prefix,type,T,xtype) \ GrB_Info GB_EVAL3 (prefix, _Vector_build_, T) /* build a vector from tuples*/ \ diff --git a/GraphBLAS/Source/GxB_Matrix_build_Scalar.c b/GraphBLAS/Source/builder/GxB_Matrix_build_Scalar.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_build_Scalar.c rename to GraphBLAS/Source/builder/GxB_Matrix_build_Scalar.c index c054287487..2c92582d39 100644 --- a/GraphBLAS/Source/GxB_Matrix_build_Scalar.c +++ b/GraphBLAS/Source/builder/GxB_Matrix_build_Scalar.c @@ -13,7 +13,7 @@ // duplicate indices are ignored, which is not an error condition. The I and J // arrays are of size nvals, just like GrB_Matrix_build_*. -#include "GB_build.h" +#include "builder/GB_build.h" #define GB_FREE_ALL ; GrB_Info GxB_Matrix_build_Scalar diff --git a/GraphBLAS/Source/GxB_Vector_build_Scalar.c b/GraphBLAS/Source/builder/GxB_Vector_build_Scalar.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_build_Scalar.c rename to GraphBLAS/Source/builder/GxB_Vector_build_Scalar.c index 3bb0eec9d3..73ce52e569 100644 --- a/GraphBLAS/Source/GxB_Vector_build_Scalar.c +++ b/GraphBLAS/Source/builder/GxB_Vector_build_Scalar.c @@ -13,7 +13,7 @@ // duplicate indices are ignored, which is not an error condition. The I array // is of size nvals, just like GrB_Vector_build_*. -#include "GB_build.h" +#include "builder/GB_build.h" #define GB_FREE_ALL ; GrB_Info GxB_Vector_build_Scalar // build a vector from (i,scalar) tuples diff --git a/GraphBLAS/Source/Factories/GB_bld_factory.c b/GraphBLAS/Source/builder/factory/GB_bld_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bld_factory.c rename to GraphBLAS/Source/builder/factory/GB_bld_factory.c diff --git a/GraphBLAS/Source/Template/GB_bld_template.c b/GraphBLAS/Source/builder/template/GB_bld_template.c similarity index 98% rename from GraphBLAS/Source/Template/GB_bld_template.c rename to GraphBLAS/Source/builder/template/GB_bld_template.c index 1d8876aee2..b885a26df7 100644 --- a/GraphBLAS/Source/Template/GB_bld_template.c +++ b/GraphBLAS/Source/builder/template/GB_bld_template.c @@ -13,12 +13,13 @@ // Sx and Tx are either both iso or both non-iso. For the iso case, // GB_ISO_BUILD is defined, and K_work is NULL. The iso case is not handled by -// the FactoryKernels/GB_bld__* workers, since it doesn't access the values at all. +// the FactoryKernels/GB_bld__* workers, since it doesn't access the values at +// all. { // k unused for some uses of this template - #include "GB_unused.h" + #include "include/GB_unused.h" if (ndupl == 0) { diff --git a/GraphBLAS/Source/GB_ops.c b/GraphBLAS/Source/builtin/GB_builtin.c similarity index 97% rename from GraphBLAS/Source/GB_ops.c rename to GraphBLAS/Source/builtin/GB_builtin.c index 58c61e51ec..b120666af0 100644 --- a/GraphBLAS/Source/GB_ops.c +++ b/GraphBLAS/Source/builtin/GB_builtin.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_ops.c: built-in types, functions, operators, and other externs +// GB_builtin.c: built-in types, functions, operators, and other externs //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -11,8 +11,8 @@ // operators, index_unary operators, binary operators, monoids, and semirings. #include "GB.h" -#include "GB_math.h" -#include "GB_ops.h" +#include "math/GB_math.h" +#include "builtin/GB_builtin.h" //------------------------------------------------------------------------------ // compiler flags @@ -411,76 +411,76 @@ GXB_SEL (LE_THUNK , "le_thunk") ; #define GB_TYPE bool #define GB_XTYPE BOOL -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE int8_t #define GB_XTYPE INT8 #define GB_SIGNED_INT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE uint8_t #define GB_XTYPE UINT8 #define GB_UNSIGNED_INT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE int16_t #define GB_XTYPE INT16 #define GB_SIGNED_INT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE uint16_t #define GB_XTYPE UINT16 #define GB_UNSIGNED_INT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE int32_t #define GB_XTYPE INT32 #define GB_SIGNED_INT #define GB_SIGNED_INDEX -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE uint32_t #define GB_XTYPE UINT32 #define GB_UNSIGNED_INT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE int64_t #define GB_XTYPE INT64 #define GB_SIGNED_INT #define GB_SIGNED_INDEX #define GB_SIGNED_INDEX64 -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE uint64_t #define GB_XTYPE UINT64 #define GB_UNSIGNED_INT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE float #define GB_XTYPE FP32 #define GB_FLOAT #define GB_FLOATING_POINT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE double #define GB_XTYPE FP64 #define GB_DOUBLE #define GB_FLOATING_POINT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE GxB_FC32_t #define GB_XTYPE FC32 #define GB_FLOAT_COMPLEX #define GB_COMPLEX #define GB_FLOATING_POINT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" #define GB_TYPE GxB_FC64_t #define GB_XTYPE FC64 #define GB_DOUBLE_COMPLEX #define GB_COMPLEX #define GB_FLOATING_POINT -#include "GB_ops_template.c" +#include "builtin/factory/GB_builtin_template.c" //------------------------------------------------------------------------------ // special cases for functions and operators @@ -802,51 +802,51 @@ GB_MONOID_DEF ( BXNOR_UINT64 , uint64_t , 0xFFFFFFFFFFFFFFFF ) #define GB_XTYPE BOOL #define GB_BOOLEAN -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE INT8 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE UINT8 #define GB_UNSIGNED_INT -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE INT16 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE UINT16 #define GB_UNSIGNED_INT -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE INT32 #define GB_POSITIONAL -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_UNSIGNED_INT #define GB_XTYPE UINT32 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_POSITIONAL #define GB_XTYPE INT64 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_UNSIGNED_INT #define GB_XTYPE UINT64 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE FP32 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_XTYPE FP64 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_COMPLEX #define GB_XTYPE FC32 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" #define GB_COMPLEX #define GB_XTYPE FC64 -#include "GB_semiring_template.c" +#include "builtin/factory/GB_semiring_template.c" //------------------------------------------------------------------------------ // 124 predefined built-in semirings in the v1.3 C API diff --git a/GraphBLAS/Source/GB_ops.h b/GraphBLAS/Source/builtin/GB_builtin.h similarity index 81% rename from GraphBLAS/Source/GB_ops.h rename to GraphBLAS/Source/builtin/GB_builtin.h index 0745ec3a64..aa0d64991a 100644 --- a/GraphBLAS/Source/GB_ops.h +++ b/GraphBLAS/Source/builtin/GB_builtin.h @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_ops.h: built-in unary and binary operators +// GB_builtin.h: built-in unary and binary operators //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -33,21 +33,21 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_BITS 1 #define GB_REAL #define GB_BOOLEAN -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE int8_t #define GB_XTYPE INT8 #define GB_BITS 8 #define GB_REAL #define GB_SIGNED_INT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE int16_t #define GB_XTYPE INT16 #define GB_BITS 16 #define GB_REAL #define GB_SIGNED_INT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE int32_t #define GB_XTYPE INT32 @@ -55,7 +55,7 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_REAL #define GB_SIGNED_INT #define GB_SIGNED_INDEX -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE int64_t #define GB_XTYPE INT64 @@ -64,35 +64,35 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_SIGNED_INT #define GB_SIGNED_INDEX #define GB_SIGNED_INDEX64 -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE uint8_t #define GB_XTYPE UINT8 #define GB_BITS 8 #define GB_REAL #define GB_UNSIGNED_INT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE uint16_t #define GB_XTYPE UINT16 #define GB_BITS 16 #define GB_REAL #define GB_UNSIGNED_INT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE uint32_t #define GB_XTYPE UINT32 #define GB_BITS 32 #define GB_REAL #define GB_UNSIGNED_INT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE uint64_t #define GB_XTYPE UINT64 #define GB_BITS 64 #define GB_REAL #define GB_UNSIGNED_INT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE float #define GB_XTYPE FP32 @@ -100,7 +100,7 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_REAL #define GB_FLOATING_POINT #define GB_FLOAT -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE double #define GB_XTYPE FP64 @@ -108,7 +108,7 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_REAL #define GB_FLOATING_POINT #define GB_DOUBLE -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE GxB_FC32_t #define GB_XTYPE FC32 @@ -116,7 +116,7 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_COMPLEX #define GB_FLOATING_POINT #define GB_FLOAT_COMPLEX -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #define GB_TYPE GxB_FC64_t #define GB_XTYPE FC64 @@ -124,7 +124,7 @@ inline void GB_nonzombie_func (bool *z, const void *x, #define GB_COMPLEX #define GB_FLOATING_POINT #define GB_DOUBLE_COMPLEX -#include "GB_ops_template.h" +#include "builtin/factory/GB_builtin_template.h" #endif diff --git a/GraphBLAS/Source/Factories/GB_ops_template.c b/GraphBLAS/Source/builtin/factory/GB_builtin_template.c similarity index 96% rename from GraphBLAS/Source/Factories/GB_ops_template.c rename to GraphBLAS/Source/builtin/factory/GB_builtin_template.c index 3a0dc619e5..30273c7e1a 100644 --- a/GraphBLAS/Source/Factories/GB_ops_template.c +++ b/GraphBLAS/Source/builtin/factory/GB_builtin_template.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_ops_template.c: built-in unary and binary functions and operators +// GB_builtin_template.c: built-in unary and binary functions and operators //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -7,10 +7,10 @@ //------------------------------------------------------------------------------ -// This file is #include'd many times in GB_ops.c to define the built-in unary -// and binary operators. In that file, GB_TYPE is a built-in C type (bool, -// int8_t, uint64_t, double, etc) for the inputs x and y, and GB_XTYPE is -// corresponding GraphBLAS type, without the prefix (BOOL, INT8, etc). +// This file is #include'd many times in GB_builtin.c to define the built-in +// unary and binary operators. In that file, GB_TYPE is a built-in C type +// (bool, int8_t, uint64_t, double, etc) for the inputs x and y, and GB_XTYPE +// is corresponding GraphBLAS type, without the prefix (BOOL, INT8, etc). //------------------------------------------------------------------------------ // unary functions z=f(x) where z and x have the same type diff --git a/GraphBLAS/Source/Factories/GB_ops_template.h b/GraphBLAS/Source/builtin/factory/GB_builtin_template.h similarity index 99% rename from GraphBLAS/Source/Factories/GB_ops_template.h rename to GraphBLAS/Source/builtin/factory/GB_builtin_template.h index e6ab7004b0..281463a074 100644 --- a/GraphBLAS/Source/Factories/GB_ops_template.h +++ b/GraphBLAS/Source/builtin/factory/GB_builtin_template.h @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_ops_template.h: define the unary and binary functions and operators +// GB_builtin_template.h: define the unary and binary functions and operators //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -// This file is #include'd many times in GB_ops.h to define the unary and +// This file is #include'd many times in GB_builtin.h to define the unary and // binary functions. #define GB_UNOP_STRUCT(op,xtype) \ diff --git a/GraphBLAS/Source/Factories/GB_semiring_template.c b/GraphBLAS/Source/builtin/factory/GB_semiring_template.c similarity index 99% rename from GraphBLAS/Source/Factories/GB_semiring_template.c rename to GraphBLAS/Source/builtin/factory/GB_semiring_template.c index 1da7ae3b76..55dadff19a 100644 --- a/GraphBLAS/Source/Factories/GB_semiring_template.c +++ b/GraphBLAS/Source/builtin/factory/GB_semiring_template.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -// This file is #include'd many times in GB_ops.c to define the built-in +// This file is #include'd many times in GB_builtin.c to define the built-in // semirings. That file has defined either GB_BOOLEAN, or GB_TYPE as one of // the 10 non-boolean types. diff --git a/GraphBLAS/Source/Shared/GB_Operator.h b/GraphBLAS/Source/builtin/include/GB_Operator.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_Operator.h rename to GraphBLAS/Source/builtin/include/GB_Operator.h diff --git a/GraphBLAS/Source/Shared/GB_matrix.h b/GraphBLAS/Source/builtin/include/GB_matrix.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_matrix.h rename to GraphBLAS/Source/builtin/include/GB_matrix.h diff --git a/GraphBLAS/Source/Shared/GB_opaque.h b/GraphBLAS/Source/builtin/include/GB_opaque.h similarity index 98% rename from GraphBLAS/Source/Shared/GB_opaque.h rename to GraphBLAS/Source/builtin/include/GB_opaque.h index 6c175431da..4b2299be32 100644 --- a/GraphBLAS/Source/Shared/GB_opaque.h +++ b/GraphBLAS/Source/builtin/include/GB_opaque.h @@ -381,27 +381,27 @@ struct GB_Type_opaque // content of GrB_Type struct GB_UnaryOp_opaque // content of GrB_UnaryOp { - #include "GB_Operator.h" + #include "include/GB_Operator.h" } ; struct GB_IndexUnaryOp_opaque // content of GrB_IndexUnaryOp { - #include "GB_Operator.h" + #include "include/GB_Operator.h" } ; struct GB_BinaryOp_opaque // content of GrB_BinaryOp { - #include "GB_Operator.h" + #include "include/GB_Operator.h" } ; struct GB_SelectOp_opaque // content of GxB_SelectOp { - #include "GB_Operator.h" + #include "include/GB_Operator.h" } ; struct GB_Operator_opaque // content of GB_Operator { - #include "GB_Operator.h" + #include "include/GB_Operator.h" } ; // Any GrB_UnaryOp, GrB_IndexUnaryOp, GrB_BinaryOp, or GxB_SelectOp can be @@ -526,17 +526,17 @@ typedef struct GB_Pending_struct *GB_Pending ; struct GB_Scalar_opaque // content of GrB_Scalar: 1-by-1 standard CSC matrix { - #include "GB_matrix.h" + #include "include/GB_matrix.h" } ; struct GB_Vector_opaque // content of GrB_Vector: m-by-1 standard CSC matrix { - #include "GB_matrix.h" + #include "include/GB_matrix.h" } ; struct GB_Matrix_opaque // content of GrB_Matrix { - #include "GB_matrix.h" + #include "include/GB_matrix.h" } ; //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_callback.c b/GraphBLAS/Source/callback/GB_callback.c similarity index 85% rename from GraphBLAS/Source/GB_callback.c rename to GraphBLAS/Source/callback/GB_callback.c index 7e644d30e3..4b86692e19 100644 --- a/GraphBLAS/Source/GB_callback.c +++ b/GraphBLAS/Source/callback/GB_callback.c @@ -7,12 +7,12 @@ //------------------------------------------------------------------------------ -#include "GB_Template.h" -#include "GB_callback.h" -#include "GB_AxB_saxpy3.h" -#include "GB_bitmap_assign_methods.h" -#include "GB_ek_slice.h" -#include "GB_sort.h" +#include "GB.h" +#include "callback/include/GB_callback.h" +#include "mxm/GB_AxB_saxpy3.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "slice/GB_ek_slice.h" +#include "sort/GB_sort.h" GB_callback_struct GB_callback = { diff --git a/GraphBLAS/Source/GB_callbacks.h b/GraphBLAS/Source/callback/GB_callbacks.h similarity index 100% rename from GraphBLAS/Source/GB_callbacks.h rename to GraphBLAS/Source/callback/GB_callbacks.h diff --git a/GraphBLAS/Source/Template/GB_callback.h b/GraphBLAS/Source/callback/include/GB_callback.h similarity index 97% rename from GraphBLAS/Source/Template/GB_callback.h rename to GraphBLAS/Source/callback/include/GB_callback.h index 0d4d9b3ce4..3cfec10491 100644 --- a/GraphBLAS/Source/Template/GB_callback.h +++ b/GraphBLAS/Source/callback/include/GB_callback.h @@ -10,9 +10,6 @@ #ifndef GB_CALLBACK_H #define GB_CALLBACK_H -#include "GB_callback_proto.h" -#include "GB_saxpy3task_struct.h" - //------------------------------------------------------------------------------ // function pointers to callback methods //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_callback_proto.h b/GraphBLAS/Source/callback/include/GB_callback_proto.h similarity index 100% rename from GraphBLAS/Source/Template/GB_callback_proto.h rename to GraphBLAS/Source/callback/include/GB_callback_proto.h diff --git a/GraphBLAS/Source/GB_cast.h b/GraphBLAS/Source/cast/GB_cast.h similarity index 100% rename from GraphBLAS/Source/GB_cast.h rename to GraphBLAS/Source/cast/GB_cast.h diff --git a/GraphBLAS/Source/GB_cast_array.c b/GraphBLAS/Source/cast/GB_cast_array.c similarity index 90% rename from GraphBLAS/Source/GB_cast_array.c rename to GraphBLAS/Source/cast/GB_cast_array.c index 3aad34bda9..ad654c3783 100644 --- a/GraphBLAS/Source/GB_cast_array.c +++ b/GraphBLAS/Source/cast/GB_cast_array.c @@ -15,10 +15,10 @@ // iso expansion is done. #include "GB.h" -#include "GB_apply.h" -#include "GB_stringify.h" +#include "apply/GB_apply.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" #endif GrB_Info GB_cast_array // typecast an array @@ -67,12 +67,12 @@ GrB_Info GB_cast_array // typecast an array // define the worker for the switch factory //---------------------------------------------------------------------- - #define GB_unop_apply(zname,xname) \ - GB (_unop_apply__identity ## zname ## xname) + #define GB_uop_apply(zname,xname) \ + GB (_uop_apply__identity ## zname ## xname) #define GB_WORKER(ignore1,zname,ztype,xname,xtype) \ { \ - info = GB_unop_apply (zname,xname) (Cx, Ax, Ab, anz, \ + info = GB_uop_apply (zname,xname) (Cx, Ax, Ab, anz, \ A_nthreads) ; \ } \ break ; @@ -82,7 +82,7 @@ GrB_Info GB_cast_array // typecast an array //---------------------------------------------------------------------- #define GB_EXCLUDE_SAME_TYPES - #include "GB_twotype_factory.c" + #include "apply/factory/GB_twotype_factory.c" } #endif @@ -111,7 +111,7 @@ GrB_Info GB_cast_array // typecast an array GB_cast_function cast_A_to_C = GB_cast_factory (code1, code2) ; #define GB_APPLY_OP(p) \ cast_A_to_C (Cx +(p*csize), Ax +(p*asize), asize) - #include "GB_apply_unop_ip.c" + #include "apply/template/GB_apply_unop_ip.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_cast_factory.c b/GraphBLAS/Source/cast/GB_cast_factory.c similarity index 96% rename from GraphBLAS/Source/GB_cast_factory.c rename to GraphBLAS/Source/cast/GB_cast_factory.c index 67907852fa..79304f908d 100644 --- a/GraphBLAS/Source/GB_cast_factory.c +++ b/GraphBLAS/Source/cast/GB_cast_factory.c @@ -16,7 +16,7 @@ // function GB_copy_user_user. #include "GB.h" -#include "GB_casting.h" +#include "cast/GB_casting.h" GB_cast_function GB_cast_factory // returns pointer to function to cast x to z ( @@ -40,7 +40,7 @@ GB_cast_function GB_cast_factory // returns pointer to function to cast x to z // switch factory for two built-in types; user types are skipped. // no generic worker so the switch factory cannot be disabled. // no JIT kernel. - #include "GB_twotype_factory.c" + #include "apply/factory/GB_twotype_factory.c" //-------------------------------------------------------------------------- // user-defined types fall through the switch factory to here diff --git a/GraphBLAS/Source/GB_cast_matrix.c b/GraphBLAS/Source/cast/GB_cast_matrix.c similarity index 100% rename from GraphBLAS/Source/GB_cast_matrix.c rename to GraphBLAS/Source/cast/GB_cast_matrix.c diff --git a/GraphBLAS/Source/GB_casting.c b/GraphBLAS/Source/cast/GB_casting.c similarity index 99% rename from GraphBLAS/Source/GB_casting.c rename to GraphBLAS/Source/cast/GB_casting.c index bac1c2d87c..b5ce206dd3 100644 --- a/GraphBLAS/Source/GB_casting.c +++ b/GraphBLAS/Source/cast/GB_casting.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_casting.h" +#include "cast/GB_casting.h" //------------------------------------------------------------------------------ // typecasting from double to integer diff --git a/GraphBLAS/Source/GB_casting.h b/GraphBLAS/Source/cast/GB_casting.h similarity index 98% rename from GraphBLAS/Source/GB_casting.h rename to GraphBLAS/Source/cast/GB_casting.h index cfe83d362b..3cbf7dd4e1 100644 --- a/GraphBLAS/Source/GB_casting.h +++ b/GraphBLAS/Source/cast/GB_casting.h @@ -531,11 +531,11 @@ GB_CAST_FUNCTION (GxB_FC64_t, GxB_FC64_t) // Instead, it is faster to simply use type punning, based on the size of the // data type, and use the inline GB_mcast function instead. -// By default, the pre-generated kernels in Source/FactoryKernels and the -// generic kernels use GB_void as the data type for the M matrix, and then call -// this function to evaluate the value of a mask entry M(i,j). The JIT kernels -// have a specific matrix type for M, and they #undef these definitions and -// replace them with specific types and a simpler test of the M(i,j) value. +// By default, the pre-generated kernels in FactoryKernels and the generic +// kernels use GB_void as the data type for the M matrix, and then call this +// function to evaluate the value of a mask entry M(i,j). The JIT kernels have +// a specific matrix type for M, and they #undef these definitions and replace +// them with specific types and a simpler test of the M(i,j) value. #define GB_M_TYPE GB_void #define GB_MCAST(Mx,pM,msize) GB_mcast ((GB_void *) Mx, pM, msize) diff --git a/GraphBLAS/Source/GB_copy_user_user.c b/GraphBLAS/Source/cast/GB_copy_user_user.c similarity index 94% rename from GraphBLAS/Source/GB_copy_user_user.c rename to GraphBLAS/Source/cast/GB_copy_user_user.c index 797f94e3d1..cf61a6ad5b 100644 --- a/GraphBLAS/Source/GB_copy_user_user.c +++ b/GraphBLAS/Source/cast/GB_copy_user_user.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_casting.h" +#include "cast/GB_casting.h" void GB_copy_user_user (void *z, const void *x, size_t s) { diff --git a/GraphBLAS/Source/GB_clear.c b/GraphBLAS/Source/clear/GB_clear.c similarity index 100% rename from GraphBLAS/Source/GB_clear.c rename to GraphBLAS/Source/clear/GB_clear.c diff --git a/GraphBLAS/Source/GB_clear.h b/GraphBLAS/Source/clear/GB_clear.h similarity index 100% rename from GraphBLAS/Source/GB_clear.h rename to GraphBLAS/Source/clear/GB_clear.h diff --git a/GraphBLAS/Source/GrB_Matrix_clear.c b/GraphBLAS/Source/clear/GrB_Matrix_clear.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_clear.c rename to GraphBLAS/Source/clear/GrB_Matrix_clear.c diff --git a/GraphBLAS/Source/GrB_Vector_clear.c b/GraphBLAS/Source/clear/GrB_Vector_clear.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_clear.c rename to GraphBLAS/Source/clear/GrB_Vector_clear.c diff --git a/GraphBLAS/Source/Contents.m b/GraphBLAS/Source/codegen/Contents.m similarity index 56% rename from GraphBLAS/Source/Contents.m rename to GraphBLAS/Source/codegen/Contents.m index d32def020f..62855d0ed3 100644 --- a/GraphBLAS/Source/Contents.m +++ b/GraphBLAS/Source/codegen/Contents.m @@ -1,8 +1,8 @@ % SuiteSparse/GraphBLAS/Source % -% These files are used to create the files in Source/*__* and -% Source/FactoryKernels, from the input files in Source/Generator. These -% functions do not need to be used by the user. +% These files are used to create the files in GraphBLAS/Source/mxm/*__* and +% GraphBLAS/FactoryKernels, from the input files in Source/codegen/Generator. +% These functions do not need to be used by the end user. % % codegen % codegen_aop @@ -21,13 +21,13 @@ % codegen_red_method % codegen_sel % codegen_sel_method -% codegen_unop -% codegen_unop_identity -% codegen_unop_method -% codegen_unop_template +% codegen_uop +% codegen_uop_identity +% codegen_uop_method +% codegen_uop_template % % codegen_type % codegen_contains -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 diff --git a/GraphBLAS/Source/Generator/GB_AxB.c b/GraphBLAS/Source/codegen/Generator/GB_AxB.c similarity index 90% rename from GraphBLAS/Source/Generator/GB_AxB.c rename to GraphBLAS/Source/codegen/Generator/GB_AxB.c index 45a2a2e359..83827c1fa6 100644 --- a/GraphBLAS/Source/Generator/GB_AxB.c +++ b/GraphBLAS/Source/codegen/Generator/GB_AxB.c @@ -2,14 +2,16 @@ // GB_AxB.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" GB_axb__include_h // semiring operators: @@ -90,7 +92,7 @@ GB_is_secondj_multiplier // disable this semiring and use the generic case if these conditions hold GB_disable -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -111,7 +113,7 @@ GrB_Info GB (_Adot2B) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -134,7 +136,7 @@ GrB_Info GB (_Adot3B) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -161,7 +163,7 @@ GrB_Info GB (_Adot4B) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot4_meta.c" + #include "mxm/template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -171,7 +173,7 @@ m4_divert(0) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB) ( @@ -200,7 +202,7 @@ GrB_Info GB (_AsaxbitB) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,7 +231,7 @@ GrB_Info GB (_Asaxpy4B) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy4_meta.c" + #include "mxm/template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; #endif } @@ -270,7 +272,7 @@ m4_divert(if_semiring_has_avx) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -306,7 +308,7 @@ m4_divert(if_semiring_has_avx) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -334,7 +336,7 @@ m4_divert(if_saxpy5_enabled) const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "mxm/template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -352,7 +354,7 @@ m4_divert(if_saxpy5_enabled) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_saxpy5_meta.c" + #include "mxm/factory/GB_AxB_saxpy5_meta.c" return (GrB_SUCCESS) ; #endif } @@ -436,8 +438,8 @@ GrB_Info GB (_Asaxpy3B) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -445,8 +447,8 @@ GrB_Info GB (_Asaxpy3B) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -486,8 +488,8 @@ GrB_Info GB (_Asaxpy3B) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -495,8 +497,8 @@ GrB_Info GB (_Asaxpy3B) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -538,8 +540,8 @@ GrB_Info GB (_Asaxpy3B) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -547,8 +549,8 @@ GrB_Info GB (_Asaxpy3B) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/Generator/GB_AxB.h b/GraphBLAS/Source/codegen/Generator/GB_AxB.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_AxB.h rename to GraphBLAS/Source/codegen/Generator/GB_AxB.h diff --git a/GraphBLAS/Source/Generator/GB_aop.c b/GraphBLAS/Source/codegen/Generator/GB_aop.c similarity index 89% rename from GraphBLAS/Source/Generator/GB_aop.c rename to GraphBLAS/Source/codegen/Generator/GB_aop.c index 0a9cefdcc3..40dd94215a 100644 --- a/GraphBLAS/Source/Generator/GB_aop.c +++ b/GraphBLAS/Source/codegen/Generator/GB_aop.c @@ -2,7 +2,7 @@ // GB_aop: assign/subassign kernels with accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_aop__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_aop__include.h" // accum operator GB_accumop @@ -52,7 +52,7 @@ GB_ax_mask // disable this operator and use the generic case if these conditions hold GB_disable -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C += A, accumulate a sparse matrix into a dense matrix @@ -72,7 +72,7 @@ GrB_Info GB (_subassign_23) { int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_23_template.c" + #include "assign/template/GB_subassign_23_template.c" } m4_divert(0) return (GrB_SUCCESS) ; @@ -98,7 +98,7 @@ GrB_Info GB (_subassign_22) GB_Y_TYPE ywork = (*((GB_Y_TYPE *) ywork_handle)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_22_template.c" + #include "assign/template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } m4_divert(0) diff --git a/GraphBLAS/Source/Generator/GB_aop.h b/GraphBLAS/Source/codegen/Generator/GB_aop.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_aop.h rename to GraphBLAS/Source/codegen/Generator/GB_aop.h diff --git a/GraphBLAS/Source/Generator/GB_as.c b/GraphBLAS/Source/codegen/Generator/GB_as.c similarity index 86% rename from GraphBLAS/Source/Generator/GB_as.c rename to GraphBLAS/Source/codegen/Generator/GB_as.c index 904864670c..cc98bb4eaa 100644 --- a/GraphBLAS/Source/Generator/GB_as.c +++ b/GraphBLAS/Source/codegen/Generator/GB_as.c @@ -2,7 +2,7 @@ // GB_as: assign/subassign kernels with no accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ #include "GB.h" #include "GB_control.h" -#include "GB_ek_slice.h" -#include "GB_as__include.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_as__include.h" // A and C matrices GB_atype @@ -26,7 +26,7 @@ GB_ax_mask // disable this operator and use the generic case if these conditions hold GB_disable -#include "GB_assign_shared_definitions.h" +#include "assign/include/GB_assign_shared_definitions.h" //------------------------------------------------------------------------------ // C = scalar, when C is dense @@ -47,7 +47,7 @@ GrB_Info GB (_subassign_05d) GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_05d_template.c" + #include "assign/template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; #endif } @@ -70,7 +70,7 @@ GrB_Info GB (_subassign_06d) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_06d_template.c" + #include "assign/template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; #endif } @@ -93,7 +93,7 @@ GrB_Info GB (_subassign_25) ASSERT (C->type == A->type) ; int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_subassign_25_template.c" + #include "assign/template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/Generator/GB_as.h b/GraphBLAS/Source/codegen/Generator/GB_as.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_as.h rename to GraphBLAS/Source/codegen/Generator/GB_as.h diff --git a/GraphBLAS/Source/Generator/GB_bld.c b/GraphBLAS/Source/codegen/Generator/GB_bld.c similarity index 84% rename from GraphBLAS/Source/Generator/GB_bld.c rename to GraphBLAS/Source/codegen/Generator/GB_bld.c index 5e0cc7cf10..38eb3b02de 100644 --- a/GraphBLAS/Source/Generator/GB_bld.c +++ b/GraphBLAS/Source/codegen/Generator/GB_bld.c @@ -2,14 +2,14 @@ // GB_bld: hard-coded functions for builder methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_bld__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_bld__include.h" // dup operator: Tx [k] += Sx [i], no typecast here GB_bld_dup @@ -27,7 +27,7 @@ GB_ytype // disable this operator and use the generic case if these conditions hold GB_disable -#include "GB_kernel_shared_definitions.h" +#include "omp/include/GB_kernel_shared_definitions.h" //------------------------------------------------------------------------------ // build a non-iso matrix @@ -50,7 +50,7 @@ GrB_Info GB (_bld) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_bld_template.c" + #include "builder/template/GB_bld_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/Generator/GB_bld.h b/GraphBLAS/Source/codegen/Generator/GB_bld.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_bld.h rename to GraphBLAS/Source/codegen/Generator/GB_bld.h diff --git a/GraphBLAS/Source/Generator/GB_ew.c b/GraphBLAS/Source/codegen/Generator/GB_ew.c similarity index 91% rename from GraphBLAS/Source/Generator/GB_ew.c rename to GraphBLAS/Source/codegen/Generator/GB_ew.c index 3240ac4a66..dfab3a7c4a 100644 --- a/GraphBLAS/Source/Generator/GB_ew.c +++ b/GraphBLAS/Source/codegen/Generator/GB_ew.c @@ -2,15 +2,17 @@ // GB_ew: ewise kernels for each built-in binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_ewise_kernels.h" -#include "GB_ew__include.h" +#include "ewise/GB_emult.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "FactoryKernels/GB_ew__include.h" // operator: GB_binaryop @@ -41,7 +43,7 @@ GB_ctype_is_btype // disable this operator and use the generic case if these conditions hold GB_disable -#include "GB_ewise_shared_definitions.h" +#include "ewise/include/GB_ewise_shared_definitions.h" m4_divert(if_is_binop_subset) //------------------------------------------------------------------------------ @@ -59,7 +61,7 @@ GrB_Info GB (_Cewise_fulla) ) { bool A_is_B = GB_all_aliased (A, B) ; - #include "GB_ewise_fulla_template.c" + #include "ewise/template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } m4_divert(0) @@ -76,7 +78,7 @@ GrB_Info GB (_Cewise_fulln) const int nthreads ) { - #include "GB_ewise_fulln_template.c" + #include "ewise/template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } @@ -98,7 +100,7 @@ GrB_Info GB (_AxD) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -118,7 +120,7 @@ GrB_Info GB (_DxB) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" return (GrB_SUCCESS) ; #endif } @@ -162,7 +164,7 @@ GrB_Info GB (_AaddB) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -210,7 +212,7 @@ GrB_Info GB (_AunionB) // for the "easy mask" condition: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" return (GrB_SUCCESS) ; #endif } @@ -238,7 +240,7 @@ GrB_Info GB (_AemultB_08) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; #endif } @@ -264,7 +266,7 @@ GrB_Info GB (_AemultB_02) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" return (GrB_SUCCESS) ; #endif } @@ -291,7 +293,7 @@ GrB_Info GB (_AemultB_03) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" return (GrB_SUCCESS) ; #endif } @@ -317,7 +319,7 @@ GrB_Info GB (_AemultB_04) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" return (GrB_SUCCESS) ; #endif } @@ -343,7 +345,7 @@ GrB_Info GB (_AemultB_bitmap) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; #endif } @@ -366,7 +368,7 @@ GrB_Info GB (_bind1st) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind1st_template.c" + #include "apply/template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; #endif } @@ -388,7 +390,7 @@ GrB_Info GB (_bind2nd) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_bind2nd_template.c" + #include "apply/template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; #endif } @@ -422,7 +424,7 @@ GrB_Info GB (_bind1st_tran) return (GrB_NO_VALUE) ; #else GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif #undef GB_BIND_1ST @@ -456,7 +458,7 @@ GrB_Info GB (_bind2nd_tran) return (GrB_NO_VALUE) ; #else GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/Generator/GB_ew.h b/GraphBLAS/Source/codegen/Generator/GB_ew.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_ew.h rename to GraphBLAS/Source/codegen/Generator/GB_ew.h diff --git a/GraphBLAS/Source/Generator/GB_red.c b/GraphBLAS/Source/codegen/Generator/GB_red.c similarity index 82% rename from GraphBLAS/Source/Generator/GB_red.c rename to GraphBLAS/Source/codegen/Generator/GB_red.c index e0e71e681e..c28bda2f2e 100644 --- a/GraphBLAS/Source/Generator/GB_red.c +++ b/GraphBLAS/Source/codegen/Generator/GB_red.c @@ -2,14 +2,14 @@ // GB_red: hard-coded functions for reductions //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_control.h" -#include "GB_red__include.h" +#include "GB_control.h" +#include "FactoryKernels/GB_red__include.h" // reduction operator and type: GB_update_op @@ -37,7 +37,7 @@ GB_panel // disable this operator and use the generic case if these conditions hold GB_disable -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" //------------------------------------------------------------------------------ // reduce to a non-iso matrix to scalar, for monoids only @@ -60,11 +60,11 @@ GrB_Info GB (_red) GB_Z_TYPE *restrict W = (GB_Z_TYPE *) W_space ; if (A->nzombies > 0 || GB_IS_BITMAP (A)) { - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { - #include "GB_reduce_panel.c" + #include "reduce/template/GB_reduce_panel.c" } (*result) = z ; return (GrB_SUCCESS) ; diff --git a/GraphBLAS/Source/Generator/GB_red.h b/GraphBLAS/Source/codegen/Generator/GB_red.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_red.h rename to GraphBLAS/Source/codegen/Generator/GB_red.h diff --git a/GraphBLAS/Source/Generator/GB_sel.c b/GraphBLAS/Source/codegen/Generator/GB_sel.c similarity index 83% rename from GraphBLAS/Source/Generator/GB_sel.c rename to GraphBLAS/Source/codegen/Generator/GB_sel.c index b9b9412910..1aadfca51d 100644 --- a/GraphBLAS/Source/Generator/GB_sel.c +++ b/GraphBLAS/Source/codegen/Generator/GB_sel.c @@ -2,14 +2,14 @@ // GB_sel: hard-coded functions for selection operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_ek_slice.h" -#include "GB_sel__include.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" +#include "FactoryKernels/GB_sel__include.h" #define GB_ENTRY_SELECTOR GB_atype @@ -18,7 +18,7 @@ GB_test_value_of_entry GB_select_entry GB_iso_select -#include "GB_select_shared_definitions.h" +#include "select/include/GB_select_shared_definitions.h" m4_divert(if_phase1) //------------------------------------------------------------------------------ @@ -38,7 +38,7 @@ GrB_Info GB (_sel_phase1) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } @@ -62,7 +62,7 @@ GrB_Info GB (_sel_phase2) { GB_A_TYPE *restrict Cx = (GB_A_TYPE *) Cx_out ; GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" return (GrB_SUCCESS) ; } @@ -81,7 +81,7 @@ GrB_Info GB (_sel_bitmap) ) { GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/Generator/GB_sel.h b/GraphBLAS/Source/codegen/Generator/GB_sel.h similarity index 100% rename from GraphBLAS/Source/Generator/GB_sel.h rename to GraphBLAS/Source/codegen/Generator/GB_sel.h diff --git a/GraphBLAS/Source/Generator/GB_unop.c b/GraphBLAS/Source/codegen/Generator/GB_uop.c similarity index 79% rename from GraphBLAS/Source/Generator/GB_unop.c rename to GraphBLAS/Source/codegen/Generator/GB_uop.c index 22a62470d9..b4f562b036 100644 --- a/GraphBLAS/Source/Generator/GB_unop.c +++ b/GraphBLAS/Source/codegen/Generator/GB_uop.c @@ -1,15 +1,15 @@ //------------------------------------------------------------------------------ -// GB_unop: hard-coded functions for each built-in unary operator +// GB_uop.c: hard-coded functions for each built-in unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" // unary operator: z = f(x) GB_unaryop @@ -30,21 +30,21 @@ GB_ctype /* aij = Ax [pA] */ \ GB_DECLAREA (aij) ; \ GB_GETA (aij, Ax, pA, false) ; \ - /* Cx [pC] = unop (aij) */ \ + /* Cx [pC] = unaryop (aij) */ \ GB_UNARYOP (Cx [pC], aij) ; \ } // disable this operator and use the generic case if these conditions hold GB_disable -#include "GB_apply_shared_definitions.h" +#include "apply/include/GB_apply_shared_definitions.h" -m4_divert(if_unop_apply_enabled) +m4_divert(if_uop_apply_enabled) //------------------------------------------------------------------------------ // Cx = op (cast (Ax)): apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_apply) +GrB_Info GB (_uop_apply) ( GB_void *Cx_out, // Cx and Ax may be aliased const GB_void *Ax_in, // A is always non-iso for this kernel @@ -56,7 +56,7 @@ GrB_Info GB (_unop_apply) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_apply_unop_template.c" + #include "apply/template/GB_apply_unop_template.c" return (GrB_SUCCESS) ; #endif } @@ -66,7 +66,7 @@ m4_divert(0) // C = op (cast (A')): transpose, typecast, and apply a unary operator //------------------------------------------------------------------------------ -GrB_Info GB (_unop_tran) +GrB_Info GB (_uop_tran) ( GrB_Matrix C, const GrB_Matrix A, @@ -79,7 +79,7 @@ GrB_Info GB (_unop_tran) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" return (GrB_SUCCESS) ; #endif } diff --git a/GraphBLAS/Source/Generator/GB_unop.h b/GraphBLAS/Source/codegen/Generator/GB_uop.h similarity index 79% rename from GraphBLAS/Source/Generator/GB_unop.h rename to GraphBLAS/Source/codegen/Generator/GB_uop.h index e8f4b3ebd5..ffae0a775a 100644 --- a/GraphBLAS/Source/Generator/GB_unop.h +++ b/GraphBLAS/Source/codegen/Generator/GB_uop.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 -m4_divert(if_unop_apply_enabled) -GrB_Info GB (_unop_apply) +m4_divert(if_uop_apply_enabled) +GrB_Info GB (_uop_apply) ( GB_void *Cx, const GB_void *Ax, @@ -11,7 +11,7 @@ GrB_Info GB (_unop_apply) ) ; m4_divert(0) -GrB_Info GB (_unop_tran) +GrB_Info GB (_uop_tran) ( GrB_Matrix C, const GrB_Matrix A, diff --git a/GraphBLAS/Source/codegen.m b/GraphBLAS/Source/codegen/codegen.m similarity index 71% rename from GraphBLAS/Source/codegen.m rename to GraphBLAS/Source/codegen/codegen.m index fd084df5b6..5017fff771 100644 --- a/GraphBLAS/Source/codegen.m +++ b/GraphBLAS/Source/codegen/codegen.m @@ -1,16 +1,16 @@ function codegen -%CODEGEN generate all code for FactoryKernels/*.c +%CODEGEN generate all code for ../../FactoryKernels/*.c % % This code generation method works on octave7 and MATLAB. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 codegen_as ; % subassign/assign with no accum codegen_axb ; % semirings codegen_ew ; % ewise kernels: binary op and accum codegen_aop ; % subassign/assign kernels with accum -codegen_unop ; % unary operators +codegen_uop ; % unary operators codegen_red ; % monoids codegen_sel ; % select operators diff --git a/GraphBLAS/Source/codegen_aop.m b/GraphBLAS/Source/codegen/codegen_aop.m similarity index 98% rename from GraphBLAS/Source/codegen_aop.m rename to GraphBLAS/Source/codegen/codegen_aop.m index 709eaecbdb..e52f44ea29 100644 --- a/GraphBLAS/Source/codegen_aop.m +++ b/GraphBLAS/Source/codegen/codegen_aop.m @@ -4,20 +4,20 @@ % This function creates all files of the form GB_aop__*.[ch], including 260 % functions (GB_aop__*.c) and one include file, GB_aop__include.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\nassign/subassign with accum operator:\n') ; -fh = fopen ('FactoryKernels/GB_aop__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_aop__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_aop__include.h: definitions for GB_aop__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_aop.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; % The ANY operator is not used as a binary operator in the generated functions. diff --git a/GraphBLAS/Source/codegen_aop_method.m b/GraphBLAS/Source/codegen/codegen_aop_method.m similarity index 96% rename from GraphBLAS/Source/codegen_aop_method.m rename to GraphBLAS/Source/codegen/codegen_aop_method.m index 8a9db3bf6b..f14e509449 100644 --- a/GraphBLAS/Source/codegen_aop_method.m +++ b/GraphBLAS/Source/codegen/codegen_aop_method.m @@ -3,7 +3,7 @@ function codegen_aop_method (binop, op, xtype) % % codegen_aop_method (binop, op, xtype) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 f = fopen ('control.m4', 'w') ; @@ -131,12 +131,12 @@ function codegen_aop_method (binop, op, xtype) fclose (f) ; % construct the *.c file -cmd = sprintf ('cat control.m4 Generator/GB_aop.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_aop__%s.c', name) ; +cmd = sprintf ('cat control.m4 Generator/GB_aop.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_aop__%s.c', name) ; fprintf ('.') ; system (cmd) ; % append to the *.h file -system ('cat control.m4 Generator/GB_aop.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_aop__include.h') ; +system ('cat control.m4 Generator/GB_aop.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_aop__include.h') ; delete ('control.m4') ; diff --git a/GraphBLAS/Source/codegen_aop_template.m b/GraphBLAS/Source/codegen/codegen_aop_template.m similarity index 94% rename from GraphBLAS/Source/codegen_aop_template.m rename to GraphBLAS/Source/codegen/codegen_aop_template.m index f98bbb2f36..89ed5cc46b 100644 --- a/GraphBLAS/Source/codegen_aop_template.m +++ b/GraphBLAS/Source/codegen/codegen_aop_template.m @@ -3,7 +3,7 @@ function codegen_aop_template (binop, bfunc, ifunc, ffunc, dfunc, fcfunc, dcfunc % % Generate functions for a binary operator, for all types, for assign/subassign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\n%-9s', binop) ; diff --git a/GraphBLAS/Source/codegen_as.m b/GraphBLAS/Source/codegen/codegen_as.m similarity index 86% rename from GraphBLAS/Source/codegen_as.m rename to GraphBLAS/Source/codegen/codegen_as.m index 78a741395a..d41c115e4e 100644 --- a/GraphBLAS/Source/codegen_as.m +++ b/GraphBLAS/Source/codegen/codegen_as.m @@ -4,20 +4,20 @@ % This function creates all files of the form GB_as__*.[ch], including 13 % functions (GB_as__*.c) and one include file, GB_as__include.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\nsubassign/assign with no accum:\n') ; -fh = fopen ('FactoryKernels/GB_as__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_as__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_as__include.h: definitions for GB_as__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_as.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; codegen_as_template ('bool') ; diff --git a/GraphBLAS/Source/codegen_as_template.m b/GraphBLAS/Source/codegen/codegen_as_template.m similarity index 91% rename from GraphBLAS/Source/codegen_as_template.m rename to GraphBLAS/Source/codegen/codegen_as_template.m index d4d3afce34..6d6ef86717 100644 --- a/GraphBLAS/Source/codegen_as_template.m +++ b/GraphBLAS/Source/codegen/codegen_as_template.m @@ -3,7 +3,7 @@ function codegen_as_template (xtype) % % codegen_as_template (xtype) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 f = fopen ('control.m4', 'w') ; @@ -45,11 +45,11 @@ function codegen_as_template (xtype) fclose (f) ; % construct the *.c file -cmd = sprintf ('cat control.m4 Generator/GB_as.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_as__%s.c', fname) ; +cmd = sprintf ('cat control.m4 Generator/GB_as.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_as__%s.c', fname) ; system (cmd) ; % append to the *.h file -system ('cat control.m4 Generator/GB_as.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_as__include.h') ; +system ('cat control.m4 Generator/GB_as.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_as__include.h') ; delete ('control.m4') ; diff --git a/GraphBLAS/Source/codegen_axb.m b/GraphBLAS/Source/codegen/codegen_axb.m similarity index 96% rename from GraphBLAS/Source/codegen_axb.m rename to GraphBLAS/Source/codegen/codegen_axb.m index b0207b5290..a99d84d5fe 100644 --- a/GraphBLAS/Source/codegen_axb.m +++ b/GraphBLAS/Source/codegen/codegen_axb.m @@ -3,9 +3,9 @@ % % This function creates all files of the form GB_AxB__*.[ch], including all % built-in semirings (GB_AxB__*.c) and two include files, -% Source/GB_AxB__include1.h and FactoryKernels/GB_AxB__include2.h. +% Source/mxm/GB_AxB__include1.h and FactoryKernels/GB_AxB__include2.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 % The ANY operator is not used as a multiplicative operator in the generated @@ -16,19 +16,19 @@ for k = 1:2 if (k == 1) - filename = sprintf ('./GB_AxB__include%d.h', k) ; + filename = sprintf ('../mxm/GB_AxB__include%d.h', k) ; else - filename = sprintf ('FactoryKernels/GB_AxB__include%d.h', k) ; + filename = sprintf ('../../FactoryKernels/GB_AxB__include%d.h', k) ; end fh = fopen (filename, 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_AxB__include%d.h: definitions for GB_AxB__*.c methods\n', k) ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; - fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; + fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_AxB.h') ; - fprintf (fh, '\n#include "GB_math.h"\n\n') ; + fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; end diff --git a/GraphBLAS/Source/codegen_axb_compare_template.m b/GraphBLAS/Source/codegen/codegen_axb_compare_template.m similarity index 98% rename from GraphBLAS/Source/codegen_axb_compare_template.m rename to GraphBLAS/Source/codegen/codegen_axb_compare_template.m index 13536e18b8..93366c8ba0 100644 --- a/GraphBLAS/Source/codegen_axb_compare_template.m +++ b/GraphBLAS/Source/codegen/codegen_axb_compare_template.m @@ -1,7 +1,7 @@ function codegen_axb_compare_template (multop, bmult, mult) %CODEGEN_AXB_COMPARE_TEMPLATE create a function for a semiring with a TxT -> bool multiplier -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\n%-7s', multop) ; diff --git a/GraphBLAS/Source/codegen_axb_method.m b/GraphBLAS/Source/codegen/codegen_axb_method.m similarity index 98% rename from GraphBLAS/Source/codegen_axb_method.m rename to GraphBLAS/Source/codegen/codegen_axb_method.m index 104e91053e..1729bd23d9 100644 --- a/GraphBLAS/Source/codegen_axb_method.m +++ b/GraphBLAS/Source/codegen/codegen_axb_method.m @@ -3,7 +3,7 @@ function codegen_axb_method (addop, multop, update, addfunc, mult, ztype, xytype % % codegen_axb_method (addop, multop, update, addfunc, mult, ztype, xytype, identity, terminal) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 if (nargin >= 5 && isempty (mult)) @@ -45,9 +45,9 @@ function codegen_axb_method (addop, multop, update, addfunc, mult, ztype, xytype xytype = 'any type' ; identity = '(any value)' ; terminal = '(any value)' ; - fprintf (f, 'm4_define(`GB_axb__include_h'', `#include "GB_AxB__include1.h"'')\n') ; + fprintf (f, 'm4_define(`GB_axb__include_h'', `#include "mxm/GB_AxB__include1.h"'')\n') ; else - fprintf (f, 'm4_define(`GB_axb__include_h'', `#include "GB_AxB__include2.h"'')\n') ; + fprintf (f, 'm4_define(`GB_axb__include_h'', `#include "FactoryKernels/GB_AxB__include2.h"'')\n') ; end is_integer = codegen_contains (ztype, 'int') ; @@ -860,12 +860,12 @@ function codegen_axb_method (addop, multop, update, addfunc, mult, ztype, xytype fclose (f) ; if (is_any_pair) - % the ANY_PAIR_ISO semiring goes in Source - s = '.' ; + % the ANY_PAIR_ISO semiring goes in Source/mxm + s = '../mxm' ; k = 1 ; else - % all other semirings go in FactoryKernels - s = 'FactoryKernels' ; + % all other semirings go in ../../FactoryKernels + s = '../../FactoryKernels' ; k = 2 ; end diff --git a/GraphBLAS/Source/codegen_axb_template.m b/GraphBLAS/Source/codegen/codegen_axb_template.m similarity index 99% rename from GraphBLAS/Source/codegen_axb_template.m rename to GraphBLAS/Source/codegen/codegen_axb_template.m index 3c5a692600..782d7097ea 100644 --- a/GraphBLAS/Source/codegen_axb_template.m +++ b/GraphBLAS/Source/codegen/codegen_axb_template.m @@ -1,7 +1,7 @@ function codegen_axb_template (multop, bmult, imult, fmult, dmult, fcmult, dcmult, no_min_max_any_times_monoids) %CODEGEN_AXB_TEMPLATE create a function for a semiring with a TxT->T multiplier -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\n%-7s', multop) ; diff --git a/GraphBLAS/Source/codegen_blank.awk b/GraphBLAS/Source/codegen/codegen_blank.awk similarity index 100% rename from GraphBLAS/Source/codegen_blank.awk rename to GraphBLAS/Source/codegen/codegen_blank.awk diff --git a/GraphBLAS/Source/codegen_contains.m b/GraphBLAS/Source/codegen/codegen_contains.m similarity index 75% rename from GraphBLAS/Source/codegen_contains.m rename to GraphBLAS/Source/codegen/codegen_contains.m index 99980f946d..c25b252290 100644 --- a/GraphBLAS/Source/codegen_contains.m +++ b/GraphBLAS/Source/codegen/codegen_contains.m @@ -1,7 +1,7 @@ function s = codegen_contains (text, pattern) %CODEGEN_CONTAINS same as contains (text, pattern) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 s = ~isempty (strfind (text, pattern)) ; diff --git a/GraphBLAS/Source/codegen_ew.m b/GraphBLAS/Source/codegen/codegen_ew.m similarity index 98% rename from GraphBLAS/Source/codegen_ew.m rename to GraphBLAS/Source/codegen/codegen_ew.m index 8f705b9b84..1c12605f77 100644 --- a/GraphBLAS/Source/codegen_ew.m +++ b/GraphBLAS/Source/codegen/codegen_ew.m @@ -4,20 +4,20 @@ % This function creates all files of the form GB_ew__*.[ch] % and one include file, GB_ew__include.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\newise binary operators:\n') ; -fh = fopen ('FactoryKernels/GB_ew__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_ew__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_ew__include.h: definitions for GB_ew__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_ew.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; % The ANY operator is not used as a binary operator in the generated functions. diff --git a/GraphBLAS/Source/codegen_ew_method.m b/GraphBLAS/Source/codegen/codegen_ew_method.m similarity index 98% rename from GraphBLAS/Source/codegen_ew_method.m rename to GraphBLAS/Source/codegen/codegen_ew_method.m index a77489763d..5b36790cae 100644 --- a/GraphBLAS/Source/codegen_ew_method.m +++ b/GraphBLAS/Source/codegen/codegen_ew_method.m @@ -1,7 +1,7 @@ function codegen_ew_method (binop, op, xtype) %CODEGEN_EW_METHOD create an ewise kernel -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 f = fopen ('control.m4', 'w') ; @@ -260,12 +260,12 @@ function codegen_ew_method (binop, op, xtype) fclose (f) ; % construct the *.c file -cmd = sprintf ('cat control.m4 Generator/GB_ew.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_ew__%s.c', name) ; +cmd = sprintf ('cat control.m4 Generator/GB_ew.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_ew__%s.c', name) ; fprintf ('.') ; system (cmd) ; % append to the *.h file -system ('cat control.m4 Generator/GB_ew.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_ew__include.h') ; +system ('cat control.m4 Generator/GB_ew.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_ew__include.h') ; delete ('control.m4') ; diff --git a/GraphBLAS/Source/codegen_ew_template.m b/GraphBLAS/Source/codegen/codegen_ew_template.m similarity index 94% rename from GraphBLAS/Source/codegen_ew_template.m rename to GraphBLAS/Source/codegen/codegen_ew_template.m index 5c32d0e05a..ca7713456a 100644 --- a/GraphBLAS/Source/codegen_ew_template.m +++ b/GraphBLAS/Source/codegen/codegen_ew_template.m @@ -3,7 +3,7 @@ function codegen_ew_template (binop, bfunc, ifunc, ffunc, dfunc, fcfunc, dcfunc) % % Generate ewise kernels for a binary operator, for all types. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\n%-9s', binop) ; diff --git a/GraphBLAS/Source/codegen_red.m b/GraphBLAS/Source/codegen/codegen_red.m similarity index 96% rename from GraphBLAS/Source/codegen_red.m rename to GraphBLAS/Source/codegen/codegen_red.m index d48a24747d..26dc661266 100644 --- a/GraphBLAS/Source/codegen_red.m +++ b/GraphBLAS/Source/codegen/codegen_red.m @@ -4,31 +4,31 @@ % This function creates all files of the form GB_red__*.c, GB_bld__*.c % and the include files GB_red__include.h and GB_bld__include.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\nreduction operators:\n') ; -fh = fopen ('FactoryKernels/GB_red__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_red__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_red__include.h: definitions for GB_red__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_red.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; -fh = fopen ('FactoryKernels/GB_bld__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_bld__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_bld__include.h: definitions for GB_bld__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_bld.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/codegen_red_method.m b/GraphBLAS/Source/codegen/codegen_red_method.m similarity index 94% rename from GraphBLAS/Source/codegen_red_method.m rename to GraphBLAS/Source/codegen/codegen_red_method.m index 6e756b2d85..8d04a34196 100644 --- a/GraphBLAS/Source/codegen_red_method.m +++ b/GraphBLAS/Source/codegen/codegen_red_method.m @@ -3,7 +3,7 @@ function codegen_red_method (opname, op, atype, identity, terminal, panel) % % codegen_red_method (opname, op, atype, identity, terminal) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 f = fopen ('control.m4', 'w') ; @@ -141,18 +141,18 @@ function codegen_red_method (opname, op, atype, identity, terminal, panel) if (is_monoid) % construct the *.c file for the reduction to scalar - cmd = sprintf ('cat control.m4 Generator/GB_red.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_red__%s.c', name) ; + cmd = sprintf ('cat control.m4 Generator/GB_red.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_red__%s.c', name) ; fprintf ('.') ; system (cmd) ; % append to the *.h file - system ('cat control.m4 Generator/GB_red.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_red__include.h') ; + system ('cat control.m4 Generator/GB_red.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_red__include.h') ; end % construct the build *.c and *.h files -cmd = sprintf ('cat control.m4 Generator/GB_bld.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_bld__%s.c', name) ; +cmd = sprintf ('cat control.m4 Generator/GB_bld.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_bld__%s.c', name) ; fprintf ('.') ; system (cmd) ; -system ('cat control.m4 Generator/GB_bld.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_bld__include.h') ; +system ('cat control.m4 Generator/GB_bld.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_bld__include.h') ; delete ('control.m4') ; diff --git a/GraphBLAS/Source/codegen_sel.m b/GraphBLAS/Source/codegen/codegen_sel.m similarity index 96% rename from GraphBLAS/Source/codegen_sel.m rename to GraphBLAS/Source/codegen/codegen_sel.m index dd41aca256..d77ea64fcf 100644 --- a/GraphBLAS/Source/codegen_sel.m +++ b/GraphBLAS/Source/codegen/codegen_sel.m @@ -4,21 +4,21 @@ % This function creates all files of the form GB_sel__*.c, % and the include file GB_sel__include.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\nselection operators:\n') ; -addpath ('../Test') ; +% addpath ('../../Test') ; -fh = fopen ('FactoryKernels/GB_sel__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_sel__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '// GB_sel__include.h: definitions for GB_sel__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; fprintf (fh, '// This file has been automatically generated from Generator/GB_sel.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; % NONZOMBIE: name selector type diff --git a/GraphBLAS/Source/codegen_sel_method.m b/GraphBLAS/Source/codegen/codegen_sel_method.m similarity index 92% rename from GraphBLAS/Source/codegen_sel_method.m rename to GraphBLAS/Source/codegen/codegen_sel_method.m index a12124fea3..ab0e716ef3 100644 --- a/GraphBLAS/Source/codegen_sel_method.m +++ b/GraphBLAS/Source/codegen/codegen_sel_method.m @@ -1,7 +1,7 @@ function codegen_sel_method (opname, func, atype) %CODEGEN_SEL_METHOD create a selection function, C = select (A,thunk) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 is_nonzombie_selector = isequal (opname, 'nonzombie') ; @@ -14,7 +14,7 @@ function codegen_sel_method (opname, func, atype) name = sprintf ('%s_%s', opname, aname) ; -if (test_contains (opname, 'col')) +if (codegen_contains (opname, 'col')) % only bitmap selector is used enable_phase1 = false ; enable_phase2 = false ; @@ -83,12 +83,12 @@ function codegen_sel_method (opname, func, atype) fclose (f) ; % construct the *.c file -cmd = sprintf ('cat control.m4 Generator/GB_sel.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_sel__%s.c', name) ; +cmd = sprintf ('cat control.m4 Generator/GB_sel.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_sel__%s.c', name) ; fprintf ('.') ; system (cmd) ; % append to the *.h file -system ('cat control.m4 Generator/GB_sel.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_sel__include.h') ; +system ('cat control.m4 Generator/GB_sel.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_sel__include.h') ; delete ('control.m4') ; diff --git a/GraphBLAS/Source/codegen_type.m b/GraphBLAS/Source/codegen/codegen_type.m similarity index 94% rename from GraphBLAS/Source/codegen_type.m rename to GraphBLAS/Source/codegen/codegen_type.m index 11bd09d136..cac18065e2 100644 --- a/GraphBLAS/Source/codegen_type.m +++ b/GraphBLAS/Source/codegen/codegen_type.m @@ -2,7 +2,7 @@ %CODEGEN_TYPE determine function fname, signed or not % and # bits a C type -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 unsigned = (type (1) == 'u') ; diff --git a/GraphBLAS/Source/codegen_unop.m b/GraphBLAS/Source/codegen/codegen_uop.m similarity index 80% rename from GraphBLAS/Source/codegen_unop.m rename to GraphBLAS/Source/codegen/codegen_uop.m index 45116d7ab1..7e3a21aae2 100644 --- a/GraphBLAS/Source/codegen_unop.m +++ b/GraphBLAS/Source/codegen/codegen_uop.m @@ -1,28 +1,28 @@ -function codegen_unop +function codegen_uop %CODEGEN_UNOP create functions for all unary operators % -% This function creates all files of the form GB_unop__*.[ch], -% and the include file GB_unop__include.h. +% This function creates all files of the form GB_uop__*.[ch], +% and the include file GB_uop__include.h. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 fprintf ('\nunary operators:\n') ; -fh = fopen ('FactoryKernels/GB_unop__include.h', 'w') ; +fh = fopen ('../../FactoryKernels/GB_uop__include.h', 'w') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; -fprintf (fh, '// GB_unop__include.h: definitions for GB_unop__*.c\n') ; +fprintf (fh, '// GB_uop__include.h: definitions for GB_uop__*.c\n') ; fprintf (fh, '//------------------------------------------------------------------------------\n') ; fprintf (fh, '\n') ; -fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.\n') ; +fprintf (fh, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.\n') ; fprintf (fh, '// SPDX-License-Identifier: Apache-2.0\n\n') ; -fprintf (fh, '// This file has been automatically generated from Generator/GB_unop.h') ; -fprintf (fh, '\n#include "GB_math.h"\n\n') ; +fprintf (fh, '// This file has been automatically generated from Generator/GB_uop.h') ; +fprintf (fh, '\n#include "math/GB_math.h"\n\n') ; fclose (fh) ; -codegen_unop_identity ; +codegen_uop_identity ; -codegen_unop_template ('ainv', ... +codegen_uop_template ('ainv', ... 'xarg', ... % bool '-xarg', ... % int '-xarg', ... % uint @@ -31,7 +31,7 @@ 'GB_FC32_ainv (xarg)', ... % GxB_FC32_t 'GB_FC64_ainv (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('abs', ... +codegen_uop_template ('abs', ... 'xarg', ... % bool 'GB_IABS (xarg)', ... % int 'xarg', ... % uint @@ -40,7 +40,7 @@ [ ], ... % GxB_FC32_t (see below) [ ]) ; ... % GxB_FC64_t (see below) -codegen_unop_template ('minv', ... +codegen_uop_template ('minv', ... 'true', ... % bool 'GB_iminv (xarg)', ... % int 'GB_iminv (xarg)', ... % uint @@ -49,7 +49,7 @@ 'GB_FC32_div (GxB_CMPLXF (1,0), xarg)', ... % GxB_FC32_t 'GB_FC64_div (GxB_CMPLX (1,0), xarg)') ; % GxB_FC64_t -codegen_unop_template ('lnot', ... +codegen_uop_template ('lnot', ... '!xarg', ... % bool '!(xarg != 0)', ... % int '!(xarg != 0)', ... % uint @@ -58,7 +58,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('bnot', ... +codegen_uop_template ('bnot', ... [ ], ... % bool '~(xarg)', ... % int '~(xarg)', ... % uint @@ -67,7 +67,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('sqrt', ... +codegen_uop_template ('sqrt', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -76,7 +76,7 @@ 'GB_csqrtf (xarg)', ... % GxB_FC32_t 'GB_csqrt (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('log', ... +codegen_uop_template ('log', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -85,7 +85,7 @@ 'GB_clogf (xarg)', ... % GxB_FC32_t 'GB_clog (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('exp', ... +codegen_uop_template ('exp', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -94,7 +94,7 @@ 'GB_cexpf (xarg)', ... % GxB_FC32_t 'GB_cexp (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('sin', ... +codegen_uop_template ('sin', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -103,7 +103,7 @@ 'GB_csinf (xarg)', ... % GxB_FC32_t 'GB_csin (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('cos', ... +codegen_uop_template ('cos', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -112,7 +112,7 @@ 'GB_ccosf (xarg)', ... % GxB_FC32_t 'GB_ccos (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('tan', ... +codegen_uop_template ('tan', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -121,7 +121,7 @@ 'GB_ctanf (xarg)', ... % GxB_FC32_t 'GB_ctan (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('asin', ... +codegen_uop_template ('asin', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -130,7 +130,7 @@ 'GB_casinf (xarg)', ... % GxB_FC32_t 'GB_casin (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('acos', ... +codegen_uop_template ('acos', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -139,7 +139,7 @@ 'GB_cacosf (xarg)', ... % GxB_FC32_t 'GB_cacos (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('atan', ... +codegen_uop_template ('atan', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -149,7 +149,7 @@ 'GB_catan (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('sinh', ... +codegen_uop_template ('sinh', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -158,7 +158,7 @@ 'GB_csinhf (xarg)', ... % GxB_FC32_t 'GB_csinh (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('cosh', ... +codegen_uop_template ('cosh', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -167,7 +167,7 @@ 'GB_ccoshf (xarg)', ... % GxB_FC32_t 'GB_ccosh (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('tanh', ... +codegen_uop_template ('tanh', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -176,7 +176,7 @@ 'GB_ctanhf (xarg)', ... % GxB_FC32_t 'GB_ctanh (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('asinh', ... +codegen_uop_template ('asinh', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -185,7 +185,7 @@ 'GB_casinhf (xarg)', ... % GxB_FC32_t 'GB_casinh (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('acosh', ... +codegen_uop_template ('acosh', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -194,7 +194,7 @@ 'GB_cacoshf (xarg)', ... % GxB_FC32_t 'GB_cacosh (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('atanh', ... +codegen_uop_template ('atanh', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -203,7 +203,7 @@ 'GB_catanhf (xarg)', ... % GxB_FC32_t 'GB_catanh (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('signum', ... +codegen_uop_template ('signum', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -212,7 +212,7 @@ 'GB_csignumf (xarg)', ... % GxB_FC32_t 'GB_csignum (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('ceil', ... +codegen_uop_template ('ceil', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -221,7 +221,7 @@ 'GB_cceilf (xarg)', ... % GxB_FC32_t 'GB_cceil (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('floor', ... +codegen_uop_template ('floor', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -230,7 +230,7 @@ 'GB_cfloorf (xarg)', ... % GxB_FC32_t 'GB_cfloor (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('round', ... +codegen_uop_template ('round', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -239,7 +239,7 @@ 'GB_croundf (xarg)', ... % GxB_FC32_t 'GB_cround (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('trunc', ... +codegen_uop_template ('trunc', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -248,7 +248,7 @@ 'GB_ctruncf (xarg)', ... % GxB_FC32_t 'GB_ctrunc (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('exp2', ... +codegen_uop_template ('exp2', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -257,7 +257,7 @@ 'GB_cexp2f (xarg)', ... % GxB_FC32_t 'GB_cexp2 (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('expm1', ... +codegen_uop_template ('expm1', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -266,7 +266,7 @@ 'GB_cexpm1f (xarg)', ... % GxB_FC32_t 'GB_cexpm1 (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('log10', ... +codegen_uop_template ('log10', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -275,7 +275,7 @@ 'GB_clog10f (xarg)', ... % GxB_FC32_t 'GB_clog10 (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('log1p', ... +codegen_uop_template ('log1p', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -284,7 +284,7 @@ 'GB_clog1pf (xarg)', ... % GxB_FC32_t 'GB_clog1p (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('log2', ... +codegen_uop_template ('log2', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -293,7 +293,7 @@ 'GB_clog2f (xarg)', ... % GxB_FC32_t 'GB_clog2 (xarg)') ; ... % GxB_FC64_t -codegen_unop_template ('frexpx', ... +codegen_uop_template ('frexpx', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -302,7 +302,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('frexpe', ... +codegen_uop_template ('frexpe', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -311,7 +311,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('lgamma', ... +codegen_uop_template ('lgamma', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -320,7 +320,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('tgamma', ... +codegen_uop_template ('tgamma', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -329,7 +329,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('erf', ... +codegen_uop_template ('erf', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -338,7 +338,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('erfc', ... +codegen_uop_template ('erfc', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -347,7 +347,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('cbrt', ... +codegen_uop_template ('cbrt', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -356,7 +356,7 @@ [ ], ... % GxB_FC32_t [ ]) ; ... % GxB_FC64_t -codegen_unop_template ('conj', ... +codegen_uop_template ('conj', ... [ ], ... % bool [ ], ... % int [ ], ... % uint @@ -371,43 +371,43 @@ % z = abs (x): x is complex, z is real fprintf ('\nabs ') ; -codegen_unop_method ('abs', 'GB_cabsf (xarg)', 'float' , 'GxB_FC32_t') ; -codegen_unop_method ('abs', 'GB_cabs (xarg)' , 'double', 'GxB_FC64_t') ; +codegen_uop_method ('abs', 'GB_cabsf (xarg)', 'float' , 'GxB_FC32_t') ; +codegen_uop_method ('abs', 'GB_cabs (xarg)' , 'double', 'GxB_FC64_t') ; % z = creal (x): x is complex, z is real fprintf ('\ncreal ') ; -codegen_unop_method ('creal', 'GB_crealf (xarg)', 'float' , 'GxB_FC32_t') ; -codegen_unop_method ('creal', 'GB_creal (xarg)' , 'double', 'GxB_FC64_t') ; +codegen_uop_method ('creal', 'GB_crealf (xarg)', 'float' , 'GxB_FC32_t') ; +codegen_uop_method ('creal', 'GB_creal (xarg)' , 'double', 'GxB_FC64_t') ; % z = cimag (x): x is complex, z is real fprintf ('\ncimag ') ; -codegen_unop_method ('cimag', 'GB_cimagf (xarg)', 'float' , 'GxB_FC32_t') ; -codegen_unop_method ('cimag', 'GB_cimag (xarg)' , 'double', 'GxB_FC64_t') ; +codegen_uop_method ('cimag', 'GB_cimagf (xarg)', 'float' , 'GxB_FC32_t') ; +codegen_uop_method ('cimag', 'GB_cimag (xarg)' , 'double', 'GxB_FC64_t') ; % z = carg (x): x is complex, z is real fprintf ('\ncarg ') ; -codegen_unop_method ('carg', 'GB_cargf (xarg)', 'float' , 'GxB_FC32_t') ; -codegen_unop_method ('carg', 'GB_carg (xarg)' , 'double', 'GxB_FC64_t') ; +codegen_uop_method ('carg', 'GB_cargf (xarg)', 'float' , 'GxB_FC32_t') ; +codegen_uop_method ('carg', 'GB_carg (xarg)' , 'double', 'GxB_FC64_t') ; % z = isinf (x): x is floating-point, z is bool fprintf ('\nisinf ') ; -codegen_unop_method ('isinf', 'isinf (xarg)' , 'bool', 'float') ; -codegen_unop_method ('isinf', 'isinf (xarg)' , 'bool', 'double') ; -codegen_unop_method ('isinf', 'GB_cisinff (xarg)', 'bool', 'GxB_FC32_t') ; -codegen_unop_method ('isinf', 'GB_cisinf (xarg)' , 'bool', 'GxB_FC64_t') ; +codegen_uop_method ('isinf', 'isinf (xarg)' , 'bool', 'float') ; +codegen_uop_method ('isinf', 'isinf (xarg)' , 'bool', 'double') ; +codegen_uop_method ('isinf', 'GB_cisinff (xarg)', 'bool', 'GxB_FC32_t') ; +codegen_uop_method ('isinf', 'GB_cisinf (xarg)' , 'bool', 'GxB_FC64_t') ; % z = isnan (x): x is floating-point, z is bool fprintf ('\nisnan ') ; -codegen_unop_method ('isnan', 'isnan (xarg)' , 'bool', 'float') ; -codegen_unop_method ('isnan', 'isnan (xarg)' , 'bool', 'double') ; -codegen_unop_method ('isnan', 'GB_cisnanf (xarg)', 'bool', 'GxB_FC32_t') ; -codegen_unop_method ('isnan', 'GB_cisnan (xarg)' , 'bool', 'GxB_FC64_t') ; +codegen_uop_method ('isnan', 'isnan (xarg)' , 'bool', 'float') ; +codegen_uop_method ('isnan', 'isnan (xarg)' , 'bool', 'double') ; +codegen_uop_method ('isnan', 'GB_cisnanf (xarg)', 'bool', 'GxB_FC32_t') ; +codegen_uop_method ('isnan', 'GB_cisnan (xarg)' , 'bool', 'GxB_FC64_t') ; % z = isfinite (x): x is floating-point, z is bool fprintf ('\nisfinite ') ; -codegen_unop_method ('isfinite', 'isfinite (xarg)' , 'bool', 'float') ; -codegen_unop_method ('isfinite', 'isfinite (xarg)' , 'bool', 'double') ; -codegen_unop_method ('isfinite', 'GB_cisfinitef (xarg)', 'bool', 'GxB_FC32_t') ; -codegen_unop_method ('isfinite', 'GB_cisfinite (xarg)' , 'bool', 'GxB_FC64_t') ; +codegen_uop_method ('isfinite', 'isfinite (xarg)' , 'bool', 'float') ; +codegen_uop_method ('isfinite', 'isfinite (xarg)' , 'bool', 'double') ; +codegen_uop_method ('isfinite', 'GB_cisfinitef (xarg)', 'bool', 'GxB_FC32_t') ; +codegen_uop_method ('isfinite', 'GB_cisfinite (xarg)' , 'bool', 'GxB_FC64_t') ; fprintf ('\n') ; diff --git a/GraphBLAS/Source/codegen_unop_identity.m b/GraphBLAS/Source/codegen/codegen_uop_identity.m similarity index 94% rename from GraphBLAS/Source/codegen_unop_identity.m rename to GraphBLAS/Source/codegen/codegen_uop_identity.m index 0c474e5011..903bc427fb 100644 --- a/GraphBLAS/Source/codegen_unop_identity.m +++ b/GraphBLAS/Source/codegen/codegen_uop_identity.m @@ -1,14 +1,14 @@ -function codegen_unop_identity +function codegen_uop_identity %CODEGEN_UNOP_IDENTITY create identity functions % % The 'identity' operator is unique: it is used for typecasting, and all 13*13 % pairs of functions are generated. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 -unop = 'identity' ; -fprintf ('\n%-9s', unop) ; +uop = 'identity' ; +fprintf ('\n%-9s', uop) ; types = { 'bool', @@ -105,7 +105,7 @@ func = sprintf ('(%s) xarg', ctype) ; end - codegen_unop_method (unop, func, ctype, atype) ; + codegen_uop_method (uop, func, ctype, atype) ; end end diff --git a/GraphBLAS/Source/codegen_unop_method.m b/GraphBLAS/Source/codegen/codegen_uop_method.m similarity index 67% rename from GraphBLAS/Source/codegen_unop_method.m rename to GraphBLAS/Source/codegen/codegen_uop_method.m index 733c7829b3..defb330f7a 100644 --- a/GraphBLAS/Source/codegen_unop_method.m +++ b/GraphBLAS/Source/codegen/codegen_uop_method.m @@ -1,14 +1,14 @@ -function codegen_unop_method (unop, op, ztype, xtype) -%CODEGEN_UNOP_METHOD create a function to compute C=unop(A) +function codegen_uop_method (uop, op, ztype, xtype) +%CODEGEN_UNOP_METHOD create a function to compute C=uop(A) % -% codegen_unop_method (unop, op, ztype, xtype) +% codegen_uop_method (uop, op, ztype, xtype) % -% unop: the name of the operator +% uop: the name of the operator % op: a string defining the computation % ztype: the type of z for z=f(x) % xtype: the type of x for z=f(x) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 f = fopen ('control.m4', 'w') ; @@ -17,22 +17,22 @@ function codegen_unop_method (unop, op, ztype, xtype) [zname, zunsigned, zbits] = codegen_type (ztype) ; [xname, xunsigned, xbits] = codegen_type (xtype) ; -name = sprintf ('%s_%s_%s', unop, zname, xname) ; +name = sprintf ('%s_%s_%s', uop, zname, xname) ; % determine if the op is identity with no typecast -is_identity = isequal (unop, 'identity') ; +is_identity = isequal (uop, 'identity') ; no_typecast = isequal (ztype, xtype) ; if (is_identity && no_typecast) - % disable the _unop_apply method - fprintf (f, 'm4_define(`_unop_apply'', `_unop_apply__(none)'')\n') ; - fprintf (f, 'm4_define(`if_unop_apply_enabled'', `-1'')\n') ; + % disable the _uop_apply method + fprintf (f, 'm4_define(`_uop_apply'', `_uop_apply__(none)'')\n') ; + fprintf (f, 'm4_define(`if_uop_apply_enabled'', `-1'')\n') ; else - fprintf (f, 'm4_define(`_unop_apply'', `_unop_apply__%s'')\n', name) ; - fprintf (f, 'm4_define(`if_unop_apply_enabled'', `0'')\n') ; + fprintf (f, 'm4_define(`_uop_apply'', `_uop_apply__%s'')\n', name) ; + fprintf (f, 'm4_define(`if_uop_apply_enabled'', `0'')\n') ; end % function names -fprintf (f, 'm4_define(`_unop_tran'', `_unop_tran__%s'')\n', name) ; +fprintf (f, 'm4_define(`_uop_tran'', `_uop_tran__%s'')\n', name) ; % type of C and A fprintf (f, 'm4_define(`GB_ctype'', `#define GB_C_TYPE %s'')\n', ztype) ; @@ -67,7 +67,7 @@ function codegen_unop_method (unop, op, ztype, xtype) fprintf (f, 'm4_define(`GB_unaryop'', `#define GB_UNARYOP(z,x) z = %s'')\n', op) ; % create the disable flag -disable = sprintf ('defined(GxB_NO_%s)', upper (unop)) ; +disable = sprintf ('defined(GxB_NO_%s)', upper (uop)) ; disable = [disable (sprintf (' || defined(GxB_NO_%s)', upper (zname)))] ; if (~isequal (zname, xname)) disable = [disable (sprintf (' || defined(GxB_NO_%s)', upper (xname)))] ; @@ -77,12 +77,12 @@ function codegen_unop_method (unop, op, ztype, xtype) fclose (f) ; % construct the *.c file -cmd = sprintf ('cat control.m4 Generator/GB_unop.c | m4 -P | awk -f codegen_blank.awk > FactoryKernels/GB_unop__%s.c', name) ; +cmd = sprintf ('cat control.m4 Generator/GB_uop.c | m4 -P | awk -f codegen_blank.awk > ../../FactoryKernels/GB_uop__%s.c', name) ; fprintf ('.') ; system (cmd) ; % append to the *.h file -system ('cat control.m4 Generator/GB_unop.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> FactoryKernels/GB_unop__include.h') ; +system ('cat control.m4 Generator/GB_uop.h | m4 -P | awk -f codegen_blank.awk | grep -v SPDX >> ../../FactoryKernels/GB_uop__include.h') ; delete ('control.m4') ; diff --git a/GraphBLAS/Source/codegen_unop_template.m b/GraphBLAS/Source/codegen/codegen_uop_template.m similarity index 77% rename from GraphBLAS/Source/codegen_unop_template.m rename to GraphBLAS/Source/codegen/codegen_uop_template.m index e01fa496c4..ae2a73f7c6 100644 --- a/GraphBLAS/Source/codegen_unop_template.m +++ b/GraphBLAS/Source/codegen/codegen_uop_template.m @@ -1,11 +1,11 @@ -function codegen_unop_template (unop, bfunc, ifunc, ufunc, ffunc, dfunc, ... +function codegen_uop_template (uop, bfunc, ifunc, ufunc, ffunc, dfunc, ... fcfunc, dcfunc) -%CODEGEN_UNOP_TEMPLATE create unop functions +%CODEGEN_UNOP_TEMPLATE create uop functions % -% codegen_unop_template (unop, bfunc, ifunc, ufunc, ffunc, dfunc, ... +% codegen_uop_template (uop, bfunc, ifunc, ufunc, ffunc, dfunc, ... % fcfunc, dcfunc) % -% unop: operator name +% uop: operator name % % strings defining each function, or empty if no such unary operator: % @@ -19,10 +19,10 @@ function codegen_unop_template (unop, bfunc, ifunc, ufunc, ffunc, dfunc, ... % % Generate functions for a unary operator, for all types. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. % SPDX-License-Identifier: Apache-2.0 -fprintf ('\n%-9s', unop) ; +fprintf ('\n%-9s', uop) ; types = { 'bool', @@ -66,6 +66,6 @@ function codegen_unop_template (unop, bfunc, ifunc, ufunc, ffunc, dfunc, ... continue ; end - codegen_unop_method (unop, func, ctype, ctype) ; + codegen_uop_method (uop, func, ctype, ctype) ; end diff --git a/GraphBLAS/Source/GB_BinaryOp_compatible.c b/GraphBLAS/Source/compatible/GB_BinaryOp_compatible.c similarity index 100% rename from GraphBLAS/Source/GB_BinaryOp_compatible.c rename to GraphBLAS/Source/compatible/GB_BinaryOp_compatible.c diff --git a/GraphBLAS/Source/GB_Mask_compatible.c b/GraphBLAS/Source/compatible/GB_Mask_compatible.c similarity index 100% rename from GraphBLAS/Source/GB_Mask_compatible.c rename to GraphBLAS/Source/compatible/GB_Mask_compatible.c diff --git a/GraphBLAS/Source/GB_Type_compatible.c b/GraphBLAS/Source/compatible/GB_Type_compatible.c similarity index 100% rename from GraphBLAS/Source/GB_Type_compatible.c rename to GraphBLAS/Source/compatible/GB_Type_compatible.c diff --git a/GraphBLAS/Source/GB_code_compatible.h b/GraphBLAS/Source/compatible/GB_code_compatible.h similarity index 100% rename from GraphBLAS/Source/GB_code_compatible.h rename to GraphBLAS/Source/compatible/GB_code_compatible.h diff --git a/GraphBLAS/Source/GB_compatible.c b/GraphBLAS/Source/compatible/GB_compatible.c similarity index 100% rename from GraphBLAS/Source/GB_compatible.c rename to GraphBLAS/Source/compatible/GB_compatible.c diff --git a/GraphBLAS/Source/GB_compatible.h b/GraphBLAS/Source/compatible/GB_compatible.h similarity index 100% rename from GraphBLAS/Source/GB_compatible.h rename to GraphBLAS/Source/compatible/GB_compatible.h diff --git a/GraphBLAS/Source/GB_concat.c b/GraphBLAS/Source/concat/GB_concat.c similarity index 99% rename from GraphBLAS/Source/GB_concat.c rename to GraphBLAS/Source/concat/GB_concat.c index 8c48c2dcbf..1dc7999910 100644 --- a/GraphBLAS/Source/GB_concat.c +++ b/GraphBLAS/Source/concat/GB_concat.c @@ -15,7 +15,7 @@ GB_FREE_WORKSPACE ; \ GB_phybix_free (C) ; -#include "GB_concat.h" +#include "concat/GB_concat.h" GrB_Info GB_concat // concatenate a 2D array of matrices ( diff --git a/GraphBLAS/Source/GB_concat.h b/GraphBLAS/Source/concat/GB_concat.h similarity index 96% rename from GraphBLAS/Source/GB_concat.h rename to GraphBLAS/Source/concat/GB_concat.h index a8e6a893a6..13ef525717 100644 --- a/GraphBLAS/Source/GB_concat.h +++ b/GraphBLAS/Source/concat/GB_concat.h @@ -10,9 +10,9 @@ #ifndef GB_CONCAT_H #define GB_CONCAT_H #include "GB.h" -#include "GB_transpose.h" -#include "GB_ek_slice.h" -#include "GB_build.h" +#include "transpose/GB_transpose.h" +#include "slice/GB_ek_slice.h" +#include "builder/GB_build.h" #define GB_TILE(Tiles,i,j) (*(Tiles + (i) * n + (j))) diff --git a/GraphBLAS/Source/GB_concat_bitmap.c b/GraphBLAS/Source/concat/GB_concat_bitmap.c similarity index 93% rename from GraphBLAS/Source/GB_concat_bitmap.c rename to GraphBLAS/Source/concat/GB_concat_bitmap.c index bd35a48f71..b0777ae2d5 100644 --- a/GraphBLAS/Source/GB_concat_bitmap.c +++ b/GraphBLAS/Source/concat/GB_concat_bitmap.c @@ -17,10 +17,10 @@ GB_FREE_WORKSPACE ; \ GB_phybix_free (C) ; -#include "GB_concat.h" -#include "GB_unused.h" -#include "GB_apply.h" -#include "GB_stringify.h" +#include "concat/GB_concat.h" +#include "include/GB_unused.h" +#include "apply/GB_apply.h" +#include "jitifyer/GB_stringify.h" GrB_Info GB_concat_bitmap // concatenate into a bitmap matrix ( @@ -151,7 +151,7 @@ GrB_Info GB_concat_bitmap // concatenate into a bitmap matrix #define GB_ISO_CONCAT #define GB_COPY(pC,pA,A_iso) ; - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; } @@ -177,21 +177,21 @@ GrB_Info GB_concat_bitmap // concatenate into a bitmap matrix case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_C_TYPE uint8_t #define GB_A_TYPE uint8_t - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user #define GB_C_TYPE uint16_t #define GB_A_TYPE uint16_t - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte #define GB_C_TYPE uint32_t #define GB_A_TYPE uint32_t - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; break ; @@ -199,14 +199,14 @@ GrB_Info GB_concat_bitmap // concatenate into a bitmap matrix // complex, or 8-byte user defined #define GB_C_TYPE uint64_t #define GB_A_TYPE uint64_t - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user #define GB_C_TYPE GB_blob16 #define GB_A_TYPE GB_blob16 - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; break ; @@ -244,7 +244,7 @@ GrB_Info GB_concat_bitmap // concatenate into a bitmap matrix #define GB_COPY(pC,pA,A_iso) \ cast_A_to_C (Cx + (pC)*csize, \ Ax + (A_iso ? 0:(pA)*asize), asize) ; - #include "GB_concat_bitmap_template.c" + #include "concat/template/GB_concat_bitmap_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_concat_full.c b/GraphBLAS/Source/concat/GB_concat_full.c similarity index 94% rename from GraphBLAS/Source/GB_concat_full.c rename to GraphBLAS/Source/concat/GB_concat_full.c index b764263221..52621b1664 100644 --- a/GraphBLAS/Source/GB_concat_full.c +++ b/GraphBLAS/Source/concat/GB_concat_full.c @@ -16,9 +16,9 @@ GB_FREE_WORKSPACE ; \ GB_phybix_free (C) ; -#include "GB_concat.h" -#include "GB_stringify.h" -#include "GB_apply.h" +#include "concat/GB_concat.h" +#include "jitifyer/GB_stringify.h" +#include "apply/GB_apply.h" GrB_Info GB_concat_full // concatenate into a full matrix ( @@ -161,21 +161,21 @@ GrB_Info GB_concat_full // concatenate into a full matrix case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_C_TYPE uint8_t #define GB_A_TYPE uint8_t - #include "GB_concat_full_template.c" + #include "concat/template/GB_concat_full_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user #define GB_C_TYPE uint16_t #define GB_A_TYPE uint16_t - #include "GB_concat_full_template.c" + #include "concat/template/GB_concat_full_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte user #define GB_C_TYPE uint32_t #define GB_A_TYPE uint32_t - #include "GB_concat_full_template.c" + #include "concat/template/GB_concat_full_template.c" info = GrB_SUCCESS ; break ; @@ -183,14 +183,14 @@ GrB_Info GB_concat_full // concatenate into a full matrix // or 8-byte user defined #define GB_C_TYPE uint64_t #define GB_A_TYPE uint64_t - #include "GB_concat_full_template.c" + #include "concat/template/GB_concat_full_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user #define GB_C_TYPE GB_blob16 #define GB_A_TYPE GB_blob16 - #include "GB_concat_full_template.c" + #include "concat/template/GB_concat_full_template.c" info = GrB_SUCCESS ; break ; @@ -228,7 +228,7 @@ GrB_Info GB_concat_full // concatenate into a full matrix #define GB_COPY(pC,pA,A_iso) \ cast_A_to_C (Cx + (pC)*csize, \ Ax + (A_iso ? 0:(pA)*asize), asize) ; - #include "GB_concat_full_template.c" + #include "concat/template/GB_concat_full_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_concat_hyper.c b/GraphBLAS/Source/concat/GB_concat_hyper.c similarity index 99% rename from GraphBLAS/Source/GB_concat_hyper.c rename to GraphBLAS/Source/concat/GB_concat_hyper.c index 599b053600..fb59770f09 100644 --- a/GraphBLAS/Source/GB_concat_hyper.c +++ b/GraphBLAS/Source/concat/GB_concat_hyper.c @@ -17,7 +17,8 @@ GB_phybix_free (C) ; \ } -#include "GB_concat.h" +#include "concat/GB_concat.h" +#include "extractTuples/GB_extractTuples.h" GrB_Info GB_concat_hyper // concatenate into a hypersparse matrix ( diff --git a/GraphBLAS/Source/GB_concat_sparse.c b/GraphBLAS/Source/concat/GB_concat_sparse.c similarity index 96% rename from GraphBLAS/Source/GB_concat_sparse.c rename to GraphBLAS/Source/concat/GB_concat_sparse.c index 3cec0de8b7..ee9d37015e 100644 --- a/GraphBLAS/Source/GB_concat_sparse.c +++ b/GraphBLAS/Source/concat/GB_concat_sparse.c @@ -27,10 +27,10 @@ GB_phybix_free (C) ; \ } -#include "GB_concat.h" -#include "GB_stringify.h" -#include "GB_apply.h" -#include "GB_unused.h" +#include "concat/GB_concat.h" +#include "jitifyer/GB_stringify.h" +#include "apply/GB_apply.h" +#include "include/GB_unused.h" GrB_Info GB_concat_sparse // concatenate into a sparse matrix ( @@ -333,7 +333,7 @@ GrB_Info GB_concat_sparse // concatenate into a sparse matrix #define GB_ISO_CONCAT #define GB_COPY(pC,pA,A_iso) ; - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; } @@ -359,21 +359,21 @@ GrB_Info GB_concat_sparse // concatenate into a sparse matrix case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_C_TYPE uint8_t #define GB_A_TYPE uint8_t - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user #define GB_C_TYPE uint16_t #define GB_A_TYPE uint16_t - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte #define GB_C_TYPE uint32_t #define GB_A_TYPE uint32_t - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; break ; @@ -381,14 +381,14 @@ GrB_Info GB_concat_sparse // concatenate into a sparse matrix // complex, or 8-byte user defined #define GB_C_TYPE uint64_t #define GB_A_TYPE uint64_t - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user #define GB_C_TYPE GB_blob16 #define GB_A_TYPE GB_blob16 - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; break ; @@ -427,7 +427,7 @@ GrB_Info GB_concat_sparse // concatenate into a sparse matrix #define GB_COPY(pC,pA,A_iso) \ cast_A_to_C (Cx + (pC)*csize, \ Ax + (A_iso ? 0:(pA)*asize), asize) ; - #include "GB_concat_sparse_template.c" + #include "concat/template/GB_concat_sparse_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GxB_Matrix_concat.c b/GraphBLAS/Source/concat/GxB_Matrix_concat.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_concat.c rename to GraphBLAS/Source/concat/GxB_Matrix_concat.c index c2e9415fbe..43902df654 100644 --- a/GraphBLAS/Source/GxB_Matrix_concat.c +++ b/GraphBLAS/Source/concat/GxB_Matrix_concat.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_concat.h" +#include "concat/GB_concat.h" GrB_Info GxB_Matrix_concat // concatenate a 2D array of matrices ( diff --git a/GraphBLAS/Source/Template/GB_concat_bitmap_bitmap.c b/GraphBLAS/Source/concat/template/GB_concat_bitmap_bitmap.c similarity index 100% rename from GraphBLAS/Source/Template/GB_concat_bitmap_bitmap.c rename to GraphBLAS/Source/concat/template/GB_concat_bitmap_bitmap.c diff --git a/GraphBLAS/Source/Template/GB_concat_bitmap_full.c b/GraphBLAS/Source/concat/template/GB_concat_bitmap_full.c similarity index 100% rename from GraphBLAS/Source/Template/GB_concat_bitmap_full.c rename to GraphBLAS/Source/concat/template/GB_concat_bitmap_full.c diff --git a/GraphBLAS/Source/Template/GB_concat_bitmap_sparse.c b/GraphBLAS/Source/concat/template/GB_concat_bitmap_sparse.c similarity index 100% rename from GraphBLAS/Source/Template/GB_concat_bitmap_sparse.c rename to GraphBLAS/Source/concat/template/GB_concat_bitmap_sparse.c diff --git a/GraphBLAS/Source/Template/GB_concat_bitmap_template.c b/GraphBLAS/Source/concat/template/GB_concat_bitmap_template.c similarity index 83% rename from GraphBLAS/Source/Template/GB_concat_bitmap_template.c rename to GraphBLAS/Source/concat/template/GB_concat_bitmap_template.c index 8326e9f339..d88fd8b81f 100644 --- a/GraphBLAS/Source/Template/GB_concat_bitmap_template.c +++ b/GraphBLAS/Source/concat/template/GB_concat_bitmap_template.c @@ -37,11 +37,11 @@ #ifdef GB_JIT_KERNEL { #if GB_A_IS_FULL - #include "GB_concat_bitmap_full.c" + #include "template/GB_concat_bitmap_full.c" #elif GB_A_IS_BITMAP - #include "GB_concat_bitmap_bitmap.c" + #include "template/GB_concat_bitmap_bitmap.c" #else - #include "GB_concat_bitmap_sparse.c" + #include "template/GB_concat_bitmap_sparse.c" #endif } #else @@ -51,19 +51,19 @@ case GxB_FULL : // A is full { - #include "GB_concat_bitmap_full.c" + #include "template/GB_concat_bitmap_full.c" } break ; case GxB_BITMAP : // A is bitmap { - #include "GB_concat_bitmap_bitmap.c" + #include "template/GB_concat_bitmap_bitmap.c" } break ; default : // A is sparse or hypersparse { - #include "GB_concat_bitmap_sparse.c" + #include "template/GB_concat_bitmap_sparse.c" } break ; } diff --git a/GraphBLAS/Source/Template/GB_concat_full_template.c b/GraphBLAS/Source/concat/template/GB_concat_full_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_concat_full_template.c rename to GraphBLAS/Source/concat/template/GB_concat_full_template.c diff --git a/GraphBLAS/Source/Template/GB_concat_sparse_template.c b/GraphBLAS/Source/concat/template/GB_concat_sparse_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_concat_sparse_template.c rename to GraphBLAS/Source/concat/template/GB_concat_sparse_template.c diff --git a/GraphBLAS/Source/GB_Context.c b/GraphBLAS/Source/context/GB_Context.c similarity index 100% rename from GraphBLAS/Source/GB_Context.c rename to GraphBLAS/Source/context/GB_Context.c diff --git a/GraphBLAS/Source/GB_Context.h b/GraphBLAS/Source/context/GB_Context.h similarity index 100% rename from GraphBLAS/Source/GB_Context.h rename to GraphBLAS/Source/context/GB_Context.h diff --git a/GraphBLAS/Source/GxB_Context_disengage.c b/GraphBLAS/Source/context/GxB_Context_disengage.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_disengage.c rename to GraphBLAS/Source/context/GxB_Context_disengage.c diff --git a/GraphBLAS/Source/GxB_Context_engage.c b/GraphBLAS/Source/context/GxB_Context_engage.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_engage.c rename to GraphBLAS/Source/context/GxB_Context_engage.c diff --git a/GraphBLAS/Source/GxB_Context_free.c b/GraphBLAS/Source/context/GxB_Context_free.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_free.c rename to GraphBLAS/Source/context/GxB_Context_free.c diff --git a/GraphBLAS/Source/GxB_Context_new.c b/GraphBLAS/Source/context/GxB_Context_new.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_new.c rename to GraphBLAS/Source/context/GxB_Context_new.c diff --git a/GraphBLAS/Source/GB_conform.c b/GraphBLAS/Source/convert/GB_conform.c similarity index 100% rename from GraphBLAS/Source/GB_conform.c rename to GraphBLAS/Source/convert/GB_conform.c diff --git a/GraphBLAS/Source/GB_conform_hyper.c b/GraphBLAS/Source/convert/GB_conform_hyper.c similarity index 100% rename from GraphBLAS/Source/GB_conform_hyper.c rename to GraphBLAS/Source/convert/GB_conform_hyper.c diff --git a/GraphBLAS/Source/GB_convert.h b/GraphBLAS/Source/convert/GB_convert.h similarity index 98% rename from GraphBLAS/Source/GB_convert.h rename to GraphBLAS/Source/convert/GB_convert.h index bce53382f4..86e55f0e59 100644 --- a/GraphBLAS/Source/GB_convert.h +++ b/GraphBLAS/Source/convert/GB_convert.h @@ -235,6 +235,12 @@ GrB_Info GB_conform // conform a matrix to its desired sparsity structure GB_Werk Werk ) ; +GrB_Info GB_conform_hyper // conform a matrix to sparse/hypersparse +( + GrB_Matrix A, // matrix to conform + GB_Werk Werk +) ; + static inline const char *GB_sparsity_char (int sparsity) { switch (sparsity) diff --git a/GraphBLAS/Source/GB_convert_any_to_bitmap.c b/GraphBLAS/Source/convert/GB_convert_any_to_bitmap.c similarity index 100% rename from GraphBLAS/Source/GB_convert_any_to_bitmap.c rename to GraphBLAS/Source/convert/GB_convert_any_to_bitmap.c diff --git a/GraphBLAS/Source/GB_convert_any_to_full.c b/GraphBLAS/Source/convert/GB_convert_any_to_full.c similarity index 100% rename from GraphBLAS/Source/GB_convert_any_to_full.c rename to GraphBLAS/Source/convert/GB_convert_any_to_full.c diff --git a/GraphBLAS/Source/GB_convert_any_to_hyper.c b/GraphBLAS/Source/convert/GB_convert_any_to_hyper.c similarity index 100% rename from GraphBLAS/Source/GB_convert_any_to_hyper.c rename to GraphBLAS/Source/convert/GB_convert_any_to_hyper.c diff --git a/GraphBLAS/Source/GB_convert_any_to_iso.c b/GraphBLAS/Source/convert/GB_convert_any_to_iso.c similarity index 100% rename from GraphBLAS/Source/GB_convert_any_to_iso.c rename to GraphBLAS/Source/convert/GB_convert_any_to_iso.c diff --git a/GraphBLAS/Source/GB_convert_any_to_non_iso.c b/GraphBLAS/Source/convert/GB_convert_any_to_non_iso.c similarity index 100% rename from GraphBLAS/Source/GB_convert_any_to_non_iso.c rename to GraphBLAS/Source/convert/GB_convert_any_to_non_iso.c diff --git a/GraphBLAS/Source/GB_convert_any_to_sparse.c b/GraphBLAS/Source/convert/GB_convert_any_to_sparse.c similarity index 100% rename from GraphBLAS/Source/GB_convert_any_to_sparse.c rename to GraphBLAS/Source/convert/GB_convert_any_to_sparse.c diff --git a/GraphBLAS/Source/GB_convert_bitmap_to_sparse.c b/GraphBLAS/Source/convert/GB_convert_bitmap_to_sparse.c similarity index 100% rename from GraphBLAS/Source/GB_convert_bitmap_to_sparse.c rename to GraphBLAS/Source/convert/GB_convert_bitmap_to_sparse.c diff --git a/GraphBLAS/Source/GB_convert_bitmap_to_sparse_test.c b/GraphBLAS/Source/convert/GB_convert_bitmap_to_sparse_test.c similarity index 100% rename from GraphBLAS/Source/GB_convert_bitmap_to_sparse_test.c rename to GraphBLAS/Source/convert/GB_convert_bitmap_to_sparse_test.c diff --git a/GraphBLAS/Source/GB_convert_bitmap_worker.c b/GraphBLAS/Source/convert/GB_convert_bitmap_worker.c similarity index 99% rename from GraphBLAS/Source/GB_convert_bitmap_worker.c rename to GraphBLAS/Source/convert/GB_convert_bitmap_worker.c index d77e647edd..c1955af296 100644 --- a/GraphBLAS/Source/GB_convert_bitmap_worker.c +++ b/GraphBLAS/Source/convert/GB_convert_bitmap_worker.c @@ -16,8 +16,8 @@ // TODO allow this function to do typecasting. #include "GB.h" -#include "GB_partition.h" -#include "GB_unused.h" +#include "slice/include/GB_partition.h" +#include "include/GB_unused.h" GrB_Info GB_convert_bitmap_worker // extract CSC/CSR or triplets from bitmap ( diff --git a/GraphBLAS/Source/GB_convert_full_to_bitmap.c b/GraphBLAS/Source/convert/GB_convert_full_to_bitmap.c similarity index 100% rename from GraphBLAS/Source/GB_convert_full_to_bitmap.c rename to GraphBLAS/Source/convert/GB_convert_full_to_bitmap.c diff --git a/GraphBLAS/Source/GB_convert_full_to_sparse.c b/GraphBLAS/Source/convert/GB_convert_full_to_sparse.c similarity index 100% rename from GraphBLAS/Source/GB_convert_full_to_sparse.c rename to GraphBLAS/Source/convert/GB_convert_full_to_sparse.c diff --git a/GraphBLAS/Source/GB_convert_hyper_to_sparse.c b/GraphBLAS/Source/convert/GB_convert_hyper_to_sparse.c similarity index 100% rename from GraphBLAS/Source/GB_convert_hyper_to_sparse.c rename to GraphBLAS/Source/convert/GB_convert_hyper_to_sparse.c diff --git a/GraphBLAS/Source/GB_convert_hyper_to_sparse_test.c b/GraphBLAS/Source/convert/GB_convert_hyper_to_sparse_test.c similarity index 100% rename from GraphBLAS/Source/GB_convert_hyper_to_sparse_test.c rename to GraphBLAS/Source/convert/GB_convert_hyper_to_sparse_test.c diff --git a/GraphBLAS/Source/GB_convert_s2b.c b/GraphBLAS/Source/convert/GB_convert_s2b.c similarity index 94% rename from GraphBLAS/Source/GB_convert_s2b.c rename to GraphBLAS/Source/convert/GB_convert_s2b.c index 1ecb4d1581..9f92724189 100644 --- a/GraphBLAS/Source/GB_convert_s2b.c +++ b/GraphBLAS/Source/convert/GB_convert_s2b.c @@ -13,9 +13,9 @@ // FUTURE: A could also be typecasted and/or a unary operator applied, // via the JIT kernel. -#include "GB_apply.h" -#include "GB_ek_slice.h" -#include "GB_stringify.h" +#include "apply/GB_apply.h" +#include "slice/GB_ek_slice.h" +#include "jitifyer/GB_stringify.h" #define GB_FREE_WORKSPACE \ { \ @@ -162,7 +162,7 @@ GrB_Info GB_convert_s2b // convert sparse/hypersparse to bitmap // A is iso; numerical entries are not modified #undef GB_COPY #define GB_COPY(Axnew,pnew,Ax,p) ; - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; } else @@ -179,32 +179,32 @@ GrB_Info GB_convert_s2b // convert sparse/hypersparse to bitmap case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_A_TYPE uint8_t - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user-defined #define GB_A_TYPE uint16_t - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte user #define GB_A_TYPE uint32_t - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; break ; case GB_8BYTE : // uint64, int64, double, float complex, // or 8-byte user defined #define GB_A_TYPE uint64_t - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user-defined #define GB_A_TYPE GB_blob16 - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; break ; @@ -237,7 +237,7 @@ GrB_Info GB_convert_s2b // convert sparse/hypersparse to bitmap #undef GB_COPY #define GB_COPY(Axnew,pnew,Ax,p) \ memcpy (Axnew +(pnew)*asize, Ax +(p)*asize, asize) - #include "GB_convert_s2b_template.c" + #include "convert/template/GB_convert_s2b_template.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_convert_s2b_test.c b/GraphBLAS/Source/convert/GB_convert_s2b_test.c similarity index 100% rename from GraphBLAS/Source/GB_convert_s2b_test.c rename to GraphBLAS/Source/convert/GB_convert_s2b_test.c diff --git a/GraphBLAS/Source/GB_convert_sparse_to_hyper.c b/GraphBLAS/Source/convert/GB_convert_sparse_to_hyper.c similarity index 100% rename from GraphBLAS/Source/GB_convert_sparse_to_hyper.c rename to GraphBLAS/Source/convert/GB_convert_sparse_to_hyper.c diff --git a/GraphBLAS/Source/GB_convert_sparse_to_hyper_test.c b/GraphBLAS/Source/convert/GB_convert_sparse_to_hyper_test.c similarity index 100% rename from GraphBLAS/Source/GB_convert_sparse_to_hyper_test.c rename to GraphBLAS/Source/convert/GB_convert_sparse_to_hyper_test.c diff --git a/GraphBLAS/Source/GB_convert_to_nonfull.c b/GraphBLAS/Source/convert/GB_convert_to_nonfull.c similarity index 100% rename from GraphBLAS/Source/GB_convert_to_nonfull.c rename to GraphBLAS/Source/convert/GB_convert_to_nonfull.c diff --git a/GraphBLAS/Source/GB_sparsity_control.c b/GraphBLAS/Source/convert/GB_sparsity_control.c similarity index 100% rename from GraphBLAS/Source/GB_sparsity_control.c rename to GraphBLAS/Source/convert/GB_sparsity_control.c diff --git a/GraphBLAS/Source/Template/GB_convert_s2b_nozombies.c b/GraphBLAS/Source/convert/template/GB_convert_s2b_nozombies.c similarity index 100% rename from GraphBLAS/Source/Template/GB_convert_s2b_nozombies.c rename to GraphBLAS/Source/convert/template/GB_convert_s2b_nozombies.c diff --git a/GraphBLAS/Source/Template/GB_convert_s2b_template.c b/GraphBLAS/Source/convert/template/GB_convert_s2b_template.c similarity index 88% rename from GraphBLAS/Source/Template/GB_convert_s2b_template.c rename to GraphBLAS/Source/convert/template/GB_convert_s2b_template.c index d6c0c2f7a0..5ff7c9d4b1 100644 --- a/GraphBLAS/Source/Template/GB_convert_s2b_template.c +++ b/GraphBLAS/Source/convert/template/GB_convert_s2b_template.c @@ -37,11 +37,11 @@ const int64_t *restrict pstart_Aslice = A_ek_slicing + A_ntasks * 2 ; #if GB_A_HAS_ZOMBIES { - #include "GB_convert_s2b_zombies.c" + #include "template/GB_convert_s2b_zombies.c" } #else { - #include "GB_convert_s2b_nozombies.c" + #include "template/GB_convert_s2b_nozombies.c" } #endif } @@ -49,11 +49,11 @@ { if (nzombies > 0) { - #include "GB_convert_s2b_zombies.c" + #include "template/GB_convert_s2b_zombies.c" } else { - #include "GB_convert_s2b_nozombies.c" + #include "template/GB_convert_s2b_nozombies.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_convert_s2b_zombies.c b/GraphBLAS/Source/convert/template/GB_convert_s2b_zombies.c similarity index 100% rename from GraphBLAS/Source/Template/GB_convert_s2b_zombies.c rename to GraphBLAS/Source/convert/template/GB_convert_s2b_zombies.c diff --git a/GraphBLAS/Source/GB_cpu_features.h b/GraphBLAS/Source/cpu/GB_cpu_features.h similarity index 100% rename from GraphBLAS/Source/GB_cpu_features.h rename to GraphBLAS/Source/cpu/GB_cpu_features.h diff --git a/GraphBLAS/Source/GB_cpu_features_impl.c b/GraphBLAS/Source/cpu/GB_cpu_features_impl.c similarity index 97% rename from GraphBLAS/Source/GB_cpu_features_impl.c rename to GraphBLAS/Source/cpu/GB_cpu_features_impl.c index b16d8f6eb9..a8da662b12 100644 --- a/GraphBLAS/Source/GB_cpu_features_impl.c +++ b/GraphBLAS/Source/cpu/GB_cpu_features_impl.c @@ -28,8 +28,8 @@ // one for each architecture (and multiple ones for x86). The supporting // files for cpu_features are #include'd by GB_cpu_features_support.c. -#include "GB_compiler.h" -#include "GB_cpu_features.h" +#include "include/GB_compiler.h" +#include "cpu/GB_cpu_features.h" #if !defined ( GBNCPUFEAT ) diff --git a/GraphBLAS/Source/GB_cpu_features_support.c b/GraphBLAS/Source/cpu/GB_cpu_features_support.c similarity index 90% rename from GraphBLAS/Source/GB_cpu_features_support.c rename to GraphBLAS/Source/cpu/GB_cpu_features_support.c index f967f176ae..38cde171d0 100644 --- a/GraphBLAS/Source/GB_cpu_features_support.c +++ b/GraphBLAS/Source/cpu/GB_cpu_features_support.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_compiler.h" -#include "GB_cpu_features.h" +#include "include/GB_compiler.h" +#include "cpu/GB_cpu_features.h" #if !defined ( GBNCPUFEAT ) diff --git a/GraphBLAS/Source/GB_cumsum.c b/GraphBLAS/Source/cumsum/GB_cumsum.c similarity index 100% rename from GraphBLAS/Source/GB_cumsum.c rename to GraphBLAS/Source/cumsum/GB_cumsum.c diff --git a/GraphBLAS/Source/GB_cumsum.h b/GraphBLAS/Source/cumsum/GB_cumsum.h similarity index 100% rename from GraphBLAS/Source/GB_cumsum.h rename to GraphBLAS/Source/cumsum/GB_cumsum.h diff --git a/GraphBLAS/Source/GrB_Descriptor_free.c b/GraphBLAS/Source/descriptor/GrB_Descriptor_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Descriptor_free.c rename to GraphBLAS/Source/descriptor/GrB_Descriptor_free.c diff --git a/GraphBLAS/Source/GrB_Descriptor_new.c b/GraphBLAS/Source/descriptor/GrB_Descriptor_new.c similarity index 100% rename from GraphBLAS/Source/GrB_Descriptor_new.c rename to GraphBLAS/Source/descriptor/GrB_Descriptor_new.c diff --git a/GraphBLAS/Source/GB_Matrix_diag.c b/GraphBLAS/Source/diag/GB_Matrix_diag.c similarity index 99% rename from GraphBLAS/Source/GB_Matrix_diag.c rename to GraphBLAS/Source/diag/GB_Matrix_diag.c index d36bf087f8..ce4a1769da 100644 --- a/GraphBLAS/Source/GB_Matrix_diag.c +++ b/GraphBLAS/Source/diag/GB_Matrix_diag.c @@ -20,8 +20,8 @@ GB_phybix_free (C) ; \ } -#include "GB_diag.h" -#include "GB_unused.h" +#include "diag/GB_diag.h" +#include "include/GB_unused.h" GrB_Info GB_Matrix_diag // build a diagonal matrix from a vector ( diff --git a/GraphBLAS/Source/GB_Vector_diag.c b/GraphBLAS/Source/diag/GB_Vector_diag.c similarity index 98% rename from GraphBLAS/Source/GB_Vector_diag.c rename to GraphBLAS/Source/diag/GB_Vector_diag.c index e5199ebd8f..016d51f232 100644 --- a/GraphBLAS/Source/GB_Vector_diag.c +++ b/GraphBLAS/Source/diag/GB_Vector_diag.c @@ -18,9 +18,9 @@ GB_phybix_free (V) ; \ } -#include "GB_diag.h" -#include "GB_select.h" -#include "GB_scalar_wrap.h" +#include "diag/GB_diag.h" +#include "select/GB_select.h" +#include "scalar/GB_Scalar_wrap.h" GrB_Info GB_Vector_diag // extract a diagonal from a matrix, as a vector ( diff --git a/GraphBLAS/Source/GB_diag.h b/GraphBLAS/Source/diag/GB_diag.h similarity index 100% rename from GraphBLAS/Source/GB_diag.h rename to GraphBLAS/Source/diag/GB_diag.h diff --git a/GraphBLAS/Source/GrB_Matrix_diag.c b/GraphBLAS/Source/diag/GrB_Matrix_diag.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_diag.c rename to GraphBLAS/Source/diag/GrB_Matrix_diag.c index fbcc560110..bbab3e6310 100644 --- a/GraphBLAS/Source/GrB_Matrix_diag.c +++ b/GraphBLAS/Source/diag/GrB_Matrix_diag.c @@ -10,7 +10,7 @@ // Similar to GxB_Matrix_diag (C, v, k, NULL), except that C is constructed // as a new matrix, like GrB_Matrix_new. C has the same type as v. -#include "GB_diag.h" +#include "diag/GB_diag.h" GrB_Info GrB_Matrix_diag // construct a diagonal matrix from a vector ( diff --git a/GraphBLAS/Source/GxB_Matrix_diag.c b/GraphBLAS/Source/diag/GxB_Matrix_diag.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_diag.c rename to GraphBLAS/Source/diag/GxB_Matrix_diag.c index b8533e4954..99db07bfc6 100644 --- a/GraphBLAS/Source/GxB_Matrix_diag.c +++ b/GraphBLAS/Source/diag/GxB_Matrix_diag.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_diag.h" +#include "diag/GB_diag.h" GrB_Info GxB_Matrix_diag // build a diagonal matrix from a vector ( diff --git a/GraphBLAS/Source/GxB_Vector_diag.c b/GraphBLAS/Source/diag/GxB_Vector_diag.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_diag.c rename to GraphBLAS/Source/diag/GxB_Vector_diag.c index 58ac3be7e9..f49fbce1ec 100644 --- a/GraphBLAS/Source/GxB_Vector_diag.c +++ b/GraphBLAS/Source/diag/GxB_Vector_diag.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_diag.h" +#include "diag/GB_diag.h" GrB_Info GxB_Vector_diag // extract a diagonal from a matrix, as a vector ( diff --git a/GraphBLAS/Source/GB_dup.c b/GraphBLAS/Source/dup/GB_dup.c similarity index 100% rename from GraphBLAS/Source/GB_dup.c rename to GraphBLAS/Source/dup/GB_dup.c diff --git a/GraphBLAS/Source/GB_dup.h b/GraphBLAS/Source/dup/GB_dup.h similarity index 100% rename from GraphBLAS/Source/GB_dup.h rename to GraphBLAS/Source/dup/GB_dup.h diff --git a/GraphBLAS/Source/GB_dup_worker.c b/GraphBLAS/Source/dup/GB_dup_worker.c similarity index 99% rename from GraphBLAS/Source/GB_dup_worker.c rename to GraphBLAS/Source/dup/GB_dup_worker.c index be0adf2c23..be15e25474 100644 --- a/GraphBLAS/Source/GB_dup_worker.c +++ b/GraphBLAS/Source/dup/GB_dup_worker.c @@ -15,7 +15,7 @@ // or dynamic header, depending on C->static_header. #include "GB.h" -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" #define GB_FREE_ALL \ GB_FREE (&C_user_name, C_user_name_size) ; diff --git a/GraphBLAS/Source/GrB_Matrix_dup.c b/GraphBLAS/Source/dup/GrB_Matrix_dup.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_dup.c rename to GraphBLAS/Source/dup/GrB_Matrix_dup.c diff --git a/GraphBLAS/Source/GrB_Scalar_dup.c b/GraphBLAS/Source/dup/GrB_Scalar_dup.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_dup.c rename to GraphBLAS/Source/dup/GrB_Scalar_dup.c diff --git a/GraphBLAS/Source/GrB_Vector_dup.c b/GraphBLAS/Source/dup/GrB_Vector_dup.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_dup.c rename to GraphBLAS/Source/dup/GrB_Vector_dup.c diff --git a/GraphBLAS/Source/GB_Element.h b/GraphBLAS/Source/element/GB_Element.h similarity index 100% rename from GraphBLAS/Source/GB_Element.h rename to GraphBLAS/Source/element/GB_Element.h diff --git a/GraphBLAS/Source/GB_setElement.c b/GraphBLAS/Source/element/GB_setElement.c similarity index 99% rename from GraphBLAS/Source/GB_setElement.c rename to GraphBLAS/Source/element/GB_setElement.c index f7700461cc..7f189bd83b 100644 --- a/GraphBLAS/Source/GB_setElement.c +++ b/GraphBLAS/Source/element/GB_setElement.c @@ -29,7 +29,7 @@ // Compare this function with GrB_*_extractElement_* -#include "GB_Pending.h" +#include "pending/GB_Pending.h" #define GB_FREE_ALL ; @@ -349,8 +349,8 @@ GrB_Info GB_setElement // set a single entry, C(row,col) = scalar // No typecasting can be done. The new pending tuple must either be // the first pending tuple, or its type must match the prior pending - // tuples. See GB_assign_shared_definitions.h for a complete - // description. + // tuples. See assign/include/GB_assign_shared_definitions.h for a + // complete description. //---------------------------------------------------------------------- // check for wait diff --git a/GraphBLAS/Source/GrB_Matrix_extractElement.c b/GraphBLAS/Source/element/GrB_Matrix_extractElement.c similarity index 88% rename from GraphBLAS/Source/GrB_Matrix_extractElement.c rename to GraphBLAS/Source/element/GrB_Matrix_extractElement.c index 6c899ab207..79a02fe05d 100644 --- a/GraphBLAS/Source/GrB_Matrix_extractElement.c +++ b/GraphBLAS/Source/element/GrB_Matrix_extractElement.c @@ -129,74 +129,74 @@ GrB_Info GrB_Matrix_extractElement_Scalar // S = A(i,j) #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_BOOL #define GB_XTYPE bool #define GB_XCODE GB_BOOL_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_INT8 #define GB_XTYPE int8_t #define GB_XCODE GB_INT8_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_INT16 #define GB_XTYPE int16_t #define GB_XCODE GB_INT16_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_INT32 #define GB_XTYPE int32_t #define GB_XCODE GB_INT32_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_INT64 #define GB_XTYPE int64_t #define GB_XCODE GB_INT64_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_UINT8 #define GB_XTYPE uint8_t #define GB_XCODE GB_UINT8_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_UINT16 #define GB_XTYPE uint16_t #define GB_XCODE GB_UINT16_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_UINT32 #define GB_XTYPE uint32_t #define GB_XCODE GB_UINT32_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_UINT64 #define GB_XTYPE uint64_t #define GB_XCODE GB_UINT64_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_FP32 #define GB_XTYPE float #define GB_XCODE GB_FP32_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_FP64 #define GB_XTYPE double #define GB_XCODE GB_FP64_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Matrix_extractElement_FC32 #define GB_XTYPE GxB_FC32_t #define GB_XCODE GB_FC32_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Matrix_extractElement_FC64 #define GB_XTYPE GxB_FC64_t #define GB_XCODE GB_FC64_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_UDT_EXTRACT #define GB_EXTRACT_ELEMENT GrB_Matrix_extractElement_UDT #define GB_XTYPE void #define GB_XCODE GB_UDT_code -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Matrix_isStoredElement -#include "GB_Matrix_extractElement.c" +#include "element/factory/GB_Matrix_extractElement.c" diff --git a/GraphBLAS/Source/GrB_Matrix_removeElement.c b/GraphBLAS/Source/element/GrB_Matrix_removeElement.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_removeElement.c rename to GraphBLAS/Source/element/GrB_Matrix_removeElement.c diff --git a/GraphBLAS/Source/GrB_Matrix_setElement.c b/GraphBLAS/Source/element/GrB_Matrix_setElement.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_setElement.c rename to GraphBLAS/Source/element/GrB_Matrix_setElement.c diff --git a/GraphBLAS/Source/GrB_Scalar_extractElement.c b/GraphBLAS/Source/element/GrB_Scalar_extractElement.c similarity index 84% rename from GraphBLAS/Source/GrB_Scalar_extractElement.c rename to GraphBLAS/Source/element/GrB_Scalar_extractElement.c index 0986d11c05..d7d1b659d9 100644 --- a/GraphBLAS/Source/GrB_Scalar_extractElement.c +++ b/GraphBLAS/Source/element/GrB_Scalar_extractElement.c @@ -21,73 +21,73 @@ #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_BOOL #define GB_XTYPE bool #define GB_XCODE GB_BOOL_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_INT8 #define GB_XTYPE int8_t #define GB_XCODE GB_INT8_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_INT16 #define GB_XTYPE int16_t #define GB_XCODE GB_INT16_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_INT32 #define GB_XTYPE int32_t #define GB_XCODE GB_INT32_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_INT64 #define GB_XTYPE int64_t #define GB_XCODE GB_INT64_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_UINT8 #define GB_XTYPE uint8_t #define GB_XCODE GB_UINT8_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_UINT16 #define GB_XTYPE uint16_t #define GB_XCODE GB_UINT16_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_UINT32 #define GB_XTYPE uint32_t #define GB_XCODE GB_UINT32_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_UINT64 #define GB_XTYPE uint64_t #define GB_XCODE GB_UINT64_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_FP32 #define GB_XTYPE float #define GB_XCODE GB_FP32_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_FP64 #define GB_XTYPE double #define GB_XCODE GB_FP64_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Scalar_extractElement_FC32 #define GB_XTYPE GxB_FC32_t #define GB_XCODE GB_FC32_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Scalar_extractElement_FC64 #define GB_XTYPE GxB_FC64_t #define GB_XCODE GB_FC64_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" #define GB_UDT_EXTRACT #define GB_EXTRACT_ELEMENT GrB_Scalar_extractElement_UDT #define GB_XTYPE void #define GB_XCODE GB_UDT_code -#include "GB_Scalar_extractElement.c" +#include "element/factory/GB_Scalar_extractElement.c" //------------------------------------------------------------------------------ // GxB_Scalar_extractElement: (historical) diff --git a/GraphBLAS/Source/GrB_Scalar_setElement.c b/GraphBLAS/Source/element/GrB_Scalar_setElement.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_setElement.c rename to GraphBLAS/Source/element/GrB_Scalar_setElement.c diff --git a/GraphBLAS/Source/GrB_Vector_extractElement.c b/GraphBLAS/Source/element/GrB_Vector_extractElement.c similarity index 88% rename from GraphBLAS/Source/GrB_Vector_extractElement.c rename to GraphBLAS/Source/element/GrB_Vector_extractElement.c index 1700364e34..70b3ec81bc 100644 --- a/GraphBLAS/Source/GrB_Vector_extractElement.c +++ b/GraphBLAS/Source/element/GrB_Vector_extractElement.c @@ -128,74 +128,74 @@ GrB_Info GrB_Vector_extractElement_Scalar // S = V(i,j) #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_BOOL #define GB_XTYPE bool #define GB_XCODE GB_BOOL_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_INT8 #define GB_XTYPE int8_t #define GB_XCODE GB_INT8_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_INT16 #define GB_XTYPE int16_t #define GB_XCODE GB_INT16_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_INT32 #define GB_XTYPE int32_t #define GB_XCODE GB_INT32_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_INT64 #define GB_XTYPE int64_t #define GB_XCODE GB_INT64_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_UINT8 #define GB_XTYPE uint8_t #define GB_XCODE GB_UINT8_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_UINT16 #define GB_XTYPE uint16_t #define GB_XCODE GB_UINT16_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_UINT32 #define GB_XTYPE uint32_t #define GB_XCODE GB_UINT32_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_UINT64 #define GB_XTYPE uint64_t #define GB_XCODE GB_UINT64_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_FP32 #define GB_XTYPE float #define GB_XCODE GB_FP32_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_FP64 #define GB_XTYPE double #define GB_XCODE GB_FP64_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Vector_extractElement_FC32 #define GB_XTYPE GxB_FC32_t #define GB_XCODE GB_FC32_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Vector_extractElement_FC64 #define GB_XTYPE GxB_FC64_t #define GB_XCODE GB_FC64_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_UDT_EXTRACT #define GB_EXTRACT_ELEMENT GrB_Vector_extractElement_UDT #define GB_XTYPE void #define GB_XCODE GB_UDT_code -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" #define GB_EXTRACT_ELEMENT GxB_Vector_isStoredElement -#include "GB_Vector_extractElement.c" +#include "element/factory/GB_Vector_extractElement.c" diff --git a/GraphBLAS/Source/GrB_Vector_removeElement.c b/GraphBLAS/Source/element/GrB_Vector_removeElement.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_removeElement.c rename to GraphBLAS/Source/element/GrB_Vector_removeElement.c diff --git a/GraphBLAS/Source/GrB_Vector_setElement.c b/GraphBLAS/Source/element/GrB_Vector_setElement.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_setElement.c rename to GraphBLAS/Source/element/GrB_Vector_setElement.c diff --git a/GraphBLAS/Source/Factories/GB_Matrix_extractElement.c b/GraphBLAS/Source/element/factory/GB_Matrix_extractElement.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_Matrix_extractElement.c rename to GraphBLAS/Source/element/factory/GB_Matrix_extractElement.c diff --git a/GraphBLAS/Source/Factories/GB_Scalar_extractElement.c b/GraphBLAS/Source/element/factory/GB_Scalar_extractElement.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_Scalar_extractElement.c rename to GraphBLAS/Source/element/factory/GB_Scalar_extractElement.c diff --git a/GraphBLAS/Source/Factories/GB_Vector_extractElement.c b/GraphBLAS/Source/element/factory/GB_Vector_extractElement.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_Vector_extractElement.c rename to GraphBLAS/Source/element/factory/GB_Vector_extractElement.c diff --git a/GraphBLAS/Source/GB_add.c b/GraphBLAS/Source/ewise/GB_add.c similarity index 99% rename from GraphBLAS/Source/GB_add.c rename to GraphBLAS/Source/ewise/GB_add.c index 2ffc102706..0c99242920 100644 --- a/GraphBLAS/Source/GB_add.c +++ b/GraphBLAS/Source/ewise/GB_add.c @@ -46,7 +46,7 @@ // C on input is empty, see GB_add_phase2.c. -#include "GB_add.h" +#include "ewise/GB_add.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GB_add.h b/GraphBLAS/Source/ewise/GB_add.h similarity index 99% rename from GraphBLAS/Source/GB_add.h rename to GraphBLAS/Source/ewise/GB_add.h index 1f3a6152b8..c2d0cdedff 100644 --- a/GraphBLAS/Source/GB_add.h +++ b/GraphBLAS/Source/ewise/GB_add.h @@ -10,7 +10,7 @@ #ifndef GB_ADD_H #define GB_ADD_H #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB_add // C=A+B, C=A+B, or C=A+B ( diff --git a/GraphBLAS/Source/GB_add_iso.c b/GraphBLAS/Source/ewise/GB_add_iso.c similarity index 99% rename from GraphBLAS/Source/GB_add_iso.c rename to GraphBLAS/Source/ewise/GB_add_iso.c index 4ce379b812..18703f2c6d 100644 --- a/GraphBLAS/Source/GB_add_iso.c +++ b/GraphBLAS/Source/ewise/GB_add_iso.c @@ -11,8 +11,8 @@ // results in an iso matrix C. If true, the output scalar c is the iso value // for the matrix C. -#include "GB_add.h" -#include "GB_emult.h" +#include "ewise/GB_add.h" +#include "ewise/GB_emult.h" bool GB_add_iso // c = op(a,b), return true if C is iso ( diff --git a/GraphBLAS/Source/GB_add_phase0.c b/GraphBLAS/Source/ewise/GB_add_phase0.c similarity index 99% rename from GraphBLAS/Source/GB_add_phase0.c rename to GraphBLAS/Source/ewise/GB_add_phase0.c index a965bf5486..2074c577a6 100644 --- a/GraphBLAS/Source/GB_add_phase0.c +++ b/GraphBLAS/Source/ewise/GB_add_phase0.c @@ -72,7 +72,7 @@ GB_FREE_WORKSPACE ; \ } -#include "GB_add.h" +#include "ewise/GB_add.h" //------------------------------------------------------------------------------ // GB_allocate_result diff --git a/GraphBLAS/Source/GB_add_phase1.c b/GraphBLAS/Source/ewise/GB_add_phase1.c similarity index 96% rename from GraphBLAS/Source/GB_add_phase1.c rename to GraphBLAS/Source/ewise/GB_add_phase1.c index 26cfd09c9e..e33eaa0c32 100644 --- a/GraphBLAS/Source/GB_add_phase1.c +++ b/GraphBLAS/Source/ewise/GB_add_phase1.c @@ -15,12 +15,12 @@ // C is sparse or hypersparse, as determined by GB_add_sparsity. M, A, and B // can have any sparsity structure, but only a specific set of cases will be -// used (see the list in Template/GB_add_sparse_template.c). +// used (see the list in ewise/template/GB_add_sparse_template.c). // Cp is constructed here, and either freed by phase2, or transplanted into C. -#include "GB_add.h" -#include "GB_unused.h" +#include "ewise/GB_add.h" +#include "include/GB_unused.h" GrB_Info GB_add_phase1 // count nnz in each C(:,j) ( @@ -95,7 +95,7 @@ GrB_Info GB_add_phase1 // count nnz in each C(:,j) bool M_is_B = GB_all_aliased (M, B) ; #define GB_ADD_PHASE 1 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" //-------------------------------------------------------------------------- // cumulative sum of Cp and fine tasks in TaskList diff --git a/GraphBLAS/Source/GB_add_phase2.c b/GraphBLAS/Source/ewise/GB_add_phase2.c similarity index 96% rename from GraphBLAS/Source/GB_add_phase2.c rename to GraphBLAS/Source/ewise/GB_add_phase2.c index 759115ed40..73b06b3738 100644 --- a/GraphBLAS/Source/GB_add_phase2.c +++ b/GraphBLAS/Source/ewise/GB_add_phase2.c @@ -29,13 +29,13 @@ // This is used by GB_wait only, for merging the pending tuple matrix T into A. // In this case, C is always sparse or hypersparse, not bitmap or full. -#include "GB_add.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_ek_slice.h" -#include "GB_stringify.h" +#include "ewise/GB_add.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "slice/GB_ek_slice.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #undef GB_FREE_WORKSPACE @@ -322,7 +322,7 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B // using a built-in binary operator (except for positional operators) //-------------------------------------------------------------------------- - #include "GB_ewise_shared_definitions.h" + #include "ewise/include/GB_ewise_shared_definitions.h" #define GB_ADD_PHASE 2 info = GrB_NO_VALUE ; @@ -343,7 +343,7 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B // are used, and the operator is not used. #define GB_ISO_ADD #define GB_IS_EWISEUNION 0 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" info = GrB_SUCCESS ; } @@ -390,7 +390,7 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B // eWiseUnion is like emult: the pair results in C being iso #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } else @@ -415,7 +415,7 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B // launch the switch factory //---------------------------------------------------------- - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } } @@ -457,7 +457,7 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B if (info == GrB_NO_VALUE) { - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (C, "(generic add: %s) ", op->name) ; // C(i,j) = (ctype) A(i,j), located in Ax [pA] @@ -534,12 +534,12 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B if (is_eWiseUnion) { #define GB_IS_EWISEUNION 1 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" } else { #define GB_IS_EWISEUNION 0 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" } } else @@ -558,12 +558,12 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B if (is_eWiseUnion) { #define GB_IS_EWISEUNION 1 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" } else { #define GB_IS_EWISEUNION 0 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" } } @@ -599,12 +599,12 @@ GrB_Info GB_add_phase2 // C=A+B, C=A+B, or C=A+B if (is_eWiseUnion) { #define GB_IS_EWISEUNION 1 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" } else { #define GB_IS_EWISEUNION 0 - #include "GB_add_template.c" + #include "ewise/template/GB_add_template.c" } } info = GrB_SUCCESS ; diff --git a/GraphBLAS/Source/GB_add_sparsity.c b/GraphBLAS/Source/ewise/GB_add_sparsity.c similarity index 97% rename from GraphBLAS/Source/GB_add_sparsity.c rename to GraphBLAS/Source/ewise/GB_add_sparsity.c index 01c9dd0176..61369f9427 100644 --- a/GraphBLAS/Source/GB_add_sparsity.c +++ b/GraphBLAS/Source/ewise/GB_add_sparsity.c @@ -16,8 +16,8 @@ // If C should be hypersparse or sparse, on output, this function simply // returns GxB_SPARSE. The final determination is made by GB_add_phase0. -#include "GB_add.h" -#include "GB_mask_very_sparse.h" +#include "ewise/GB_add.h" +#include "mask/GB_mask_very_sparse.h" int GB_add_sparsity // return the sparsity structure for C ( @@ -112,9 +112,9 @@ int GB_add_sparsity // return the sparsity structure for C if (A_is_sparse_or_hyper || B_is_sparse_or_hyper) { - // see Template/GB_add_sparse_M_sparse.c for a vector-by-vector - // test of the "easy mask" condition. This test is global for - // all vectors of the matrices: + // see ewise/template/GB_add_sparse_M_sparse.c for a + // vector-by-vector test of the "easy mask" condition. This + // test is global for all vectors of the matrices: bool M_is_A = GB_all_aliased (M, A) ; bool M_is_B = GB_all_aliased (M, B) ; bool all_easy_mask = Mask_struct && diff --git a/GraphBLAS/Source/GB_emult.c b/GraphBLAS/Source/ewise/GB_emult.c similarity index 99% rename from GraphBLAS/Source/GB_emult.c rename to GraphBLAS/Source/ewise/GB_emult.c index 91e123290e..73f67f5891 100644 --- a/GraphBLAS/Source/GB_emult.c +++ b/GraphBLAS/Source/ewise/GB_emult.c @@ -31,9 +31,9 @@ // but T=A.*B is sparse (M sparse, with A and B bitmap), then it too can // be done in place. -#include "GB_emult.h" -#include "GB_add.h" -#include "GB_binop.h" +#include "ewise/GB_emult.h" +#include "ewise/GB_add.h" +#include "binaryop/GB_binop.h" #define GB_FREE_WORKSPACE \ { \ diff --git a/GraphBLAS/Source/GB_emult.h b/GraphBLAS/Source/ewise/GB_emult.h similarity index 99% rename from GraphBLAS/Source/GB_emult.h rename to GraphBLAS/Source/ewise/GB_emult.h index 7a9e7e2a03..510f280438 100644 --- a/GraphBLAS/Source/GB_emult.h +++ b/GraphBLAS/Source/ewise/GB_emult.h @@ -10,8 +10,8 @@ #ifndef GB_EMULT_H #define GB_EMULT_H #include "GB.h" -#include "GB_math.h" -#include "GB_bitmap_assign_methods.h" +#include "math/GB_math.h" +#include "assign/GB_bitmap_assign_methods.h" #define GB_EMULT_METHOD1_ADD 1 /* use GB_add instead of emult */ #define GB_EMULT_METHOD2 2 /* use GB_emult_02 */ diff --git a/GraphBLAS/Source/GB_emult_02.c b/GraphBLAS/Source/ewise/GB_emult_02.c similarity index 97% rename from GraphBLAS/Source/GB_emult_02.c rename to GraphBLAS/Source/ewise/GB_emult_02.c index 4559753184..0cae107881 100644 --- a/GraphBLAS/Source/GB_emult_02.c +++ b/GraphBLAS/Source/ewise/GB_emult_02.c @@ -55,13 +55,13 @@ // sparse full sparse bitmap // sparse full sparse full -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_WORKSPACE \ @@ -250,7 +250,7 @@ GrB_Info GB_emult_02 // C=A.*B when A is sparse/hyper, B bitmap/full // pattern of C = set intersection of pattern of A and B #define GB_ISO_EMULT - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" info = GrB_SUCCESS ; } @@ -289,7 +289,7 @@ GrB_Info GB_emult_02 // C=A.*B when A is sparse/hyper, B bitmap/full op, false, &opcode, &xcode, &ycode, &zcode) && ccode == zcode) { #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_emult_02_phase1.c b/GraphBLAS/Source/ewise/GB_emult_02_phase1.c similarity index 98% rename from GraphBLAS/Source/GB_emult_02_phase1.c rename to GraphBLAS/Source/ewise/GB_emult_02_phase1.c index b9973d68bb..6289bd6c6f 100644 --- a/GraphBLAS/Source/GB_emult_02_phase1.c +++ b/GraphBLAS/Source/ewise/GB_emult_02_phase1.c @@ -13,10 +13,10 @@ #define GB_FREE_ALL ; -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" GrB_Info GB_emult_02_phase1 // symbolic analysis for GB_emult_02 and GB_emult_03 ( diff --git a/GraphBLAS/Source/GB_emult_03.c b/GraphBLAS/Source/ewise/GB_emult_03.c similarity index 97% rename from GraphBLAS/Source/GB_emult_03.c rename to GraphBLAS/Source/ewise/GB_emult_03.c index 295833f30c..539c39007c 100644 --- a/GraphBLAS/Source/GB_emult_03.c +++ b/GraphBLAS/Source/ewise/GB_emult_03.c @@ -55,13 +55,13 @@ // sparse full bitmap sparse // sparse full full sparse -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_WORKSPACE \ @@ -250,7 +250,7 @@ GrB_Info GB_emult_03 // C=A.*B when A bitmap/full, B is sparse/hyper // pattern of C = set intersection of pattern of A and B #define GB_ISO_EMULT - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" info = GrB_SUCCESS ; } @@ -290,7 +290,7 @@ GrB_Info GB_emult_03 // C=A.*B when A bitmap/full, B is sparse/hyper { #define GB_NO_PAIR #define GB_NO_COMMUTATIVE_BINARY_OPS - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_emult_04.c b/GraphBLAS/Source/ewise/GB_emult_04.c similarity index 97% rename from GraphBLAS/Source/GB_emult_04.c rename to GraphBLAS/Source/ewise/GB_emult_04.c index 0dc8bf55f2..ce8fa8fb69 100644 --- a/GraphBLAS/Source/GB_emult_04.c +++ b/GraphBLAS/Source/ewise/GB_emult_04.c @@ -26,13 +26,13 @@ // Just change the "&&" to "||" in the GB_emult_04_template. // If A and B are both full, eadd and emult are identical. -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_WORKSPACE \ @@ -287,7 +287,7 @@ GrB_Info GB_emult_04 // C=A.*B, M sparse/hyper, A and B bitmap/full // pattern of C = set intersection of pattern of A and B #define GB_ISO_EMULT - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" info = GrB_SUCCESS ; } @@ -325,7 +325,7 @@ GrB_Info GB_emult_04 // C=A.*B, M sparse/hyper, A and B bitmap/full op, false, &opcode, &xcode, &ycode, &zcode) && ccode == zcode) { #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_emult_08_phase0.c b/GraphBLAS/Source/ewise/GB_emult_08_phase0.c similarity index 99% rename from GraphBLAS/Source/GB_emult_08_phase0.c rename to GraphBLAS/Source/ewise/GB_emult_08_phase0.c index 8ab085d4a1..b0306fdeb1 100644 --- a/GraphBLAS/Source/GB_emult_08_phase0.c +++ b/GraphBLAS/Source/ewise/GB_emult_08_phase0.c @@ -45,7 +45,7 @@ GB_FREE_WORK (&C_to_B, C_to_B_size) ; \ } -#include "GB_emult.h" +#include "ewise/GB_emult.h" GrB_Info GB_emult_08_phase0 // find vectors in C for C=A.*B or C=A.*B ( diff --git a/GraphBLAS/Source/GB_emult_08_phase1.c b/GraphBLAS/Source/ewise/GB_emult_08_phase1.c similarity index 98% rename from GraphBLAS/Source/GB_emult_08_phase1.c rename to GraphBLAS/Source/ewise/GB_emult_08_phase1.c index 142b3a90de..3c94f39502 100644 --- a/GraphBLAS/Source/GB_emult_08_phase1.c +++ b/GraphBLAS/Source/ewise/GB_emult_08_phase1.c @@ -19,7 +19,7 @@ // Cp is either freed by GB_emult_08_phase2, or transplanted into C. -#include "GB_emult.h" +#include "ewise/GB_emult.h" GrB_Info GB_emult_08_phase1 // count nnz in each C(:,j) ( @@ -96,7 +96,7 @@ GrB_Info GB_emult_08_phase1 // count nnz in each C(:,j) //-------------------------------------------------------------------------- #define GB_EMULT_08_PHASE 1 - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" //-------------------------------------------------------------------------- // cumulative sum of Cp and fine tasks in TaskList diff --git a/GraphBLAS/Source/GB_emult_08_phase2.c b/GraphBLAS/Source/ewise/GB_emult_08_phase2.c similarity index 97% rename from GraphBLAS/Source/GB_emult_08_phase2.c rename to GraphBLAS/Source/ewise/GB_emult_08_phase2.c index 55ee004d25..06b29a9f6e 100644 --- a/GraphBLAS/Source/GB_emult_08_phase2.c +++ b/GraphBLAS/Source/ewise/GB_emult_08_phase2.c @@ -25,13 +25,13 @@ // This function either frees Cp or transplants it into C, as C->p. Either // way, the caller must not free it. -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_ALL \ @@ -201,7 +201,7 @@ GrB_Info GB_emult_08_phase2 // C=A.*B or C=A.*B // pattern of C = set intersection of pattern of A and B #define GB_ISO_EMULT - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" info = GrB_SUCCESS ; } @@ -240,7 +240,7 @@ GrB_Info GB_emult_08_phase2 // C=A.*B or C=A.*B op, false, &opcode, &xcode, &ycode, &zcode) && ccode == zcode) { #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_emult_bitmap.c b/GraphBLAS/Source/ewise/GB_emult_bitmap.c similarity index 97% rename from GraphBLAS/Source/GB_emult_bitmap.c rename to GraphBLAS/Source/ewise/GB_emult_bitmap.c index b177bfdf07..42ce935089 100644 --- a/GraphBLAS/Source/GB_emult_bitmap.c +++ b/GraphBLAS/Source/ewise/GB_emult_bitmap.c @@ -58,14 +58,14 @@ // TODO: if C is bitmap on input and C_sparsity is GxB_BITMAP, then C=A.*B, // C=A.*B and C+=A.*B can all be done in-place. -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_ek_slice.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "slice/GB_ek_slice.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_WORKSPACE \ @@ -211,7 +211,7 @@ GrB_Info GB_emult_bitmap // C=A.*B, C=A.*B, or C=A.*B // pattern of C = set intersection of pattern of A and B #define GB_ISO_EMULT - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" info = GrB_SUCCESS ; } @@ -251,7 +251,7 @@ GrB_Info GB_emult_bitmap // C=A.*B, C=A.*B, or C=A.*B op, false, &opcode, &xcode, &ycode, &zcode) && ccode == zcode) { #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_emult_generic.c b/GraphBLAS/Source/ewise/GB_emult_generic.c similarity index 89% rename from GraphBLAS/Source/GB_emult_generic.c rename to GraphBLAS/Source/ewise/GB_emult_generic.c index ca27862f3a..e8b22c74e3 100644 --- a/GraphBLAS/Source/GB_emult_generic.c +++ b/GraphBLAS/Source/ewise/GB_emult_generic.c @@ -14,12 +14,12 @@ // C is not iso, but A and/or B might be. -#include "GB_ewise.h" -#include "GB_emult.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_ek_slice.h" -#include "GB_generic.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_emult.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "slice/GB_ek_slice.h" +#include "generic/GB_generic.h" GrB_Info GB_emult_generic // generic emult ( @@ -126,7 +126,7 @@ GrB_Info GB_emult_generic // generic emult cast_B_to_Y (bij, Bx +((B_iso) ? 0:(pB)*bsize), bsize) ; \ } - #include "GB_ewise_shared_definitions.h" + #include "ewise/include/GB_ewise_shared_definitions.h" //-------------------------------------------------------------------------- // do the ewise operation @@ -173,29 +173,29 @@ GrB_Info GB_emult_generic // generic emult { // C=A.*B or C<#M>=A.*B; A sparse/hyper; M and B bitmap/full // C is sparse - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" } else if (ewise_method == GB_EMULT_METHOD3) { // C=A.*B or C<#M>=A.*B; B sparse/hyper; M and A bitmap/full // C is sparse - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" } else if (ewise_method == GB_EMULT_METHOD4) { // C=A.*B; M sparse/hyper, A and B bitmap/full // C is sparse - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" } else if (C_sparsity == GxB_BITMAP) { // C is bitmap: emult methods 5, 6, or 7 - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" } else { // C is sparse: emult method 8 (abcdefgh) - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" } } else @@ -215,29 +215,29 @@ GrB_Info GB_emult_generic // generic emult { // C=A.*B or C<#M>=A.*B; A sparse/hyper; M and B bitmap/full // C is sparse - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" } else if (ewise_method == GB_EMULT_METHOD3) { // C=A.*B or C<#M>=A.*B; B sparse/hyper; M and A bitmap/full // C is sparse - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" } else if (ewise_method == GB_EMULT_METHOD4) { // C=A.*B; M sparse/hyper, A and B bitmap/full // C is sparse - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" } else if (C_sparsity == GxB_BITMAP) { // C is bitmap: emult methods 5, 6, or 7 - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" } else { // C is sparse: emult method 8 (abcdefgh) - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" } } @@ -270,30 +270,30 @@ GrB_Info GB_emult_generic // generic emult // emult method 2 (abc) // C=A.*B or C<#M>=A.*B; A sparse/hyper; M and B bitmap/full // C is sparse - #include "GB_emult_02_template.c" + #include "ewise/template/GB_emult_02_template.c" } else if (ewise_method == GB_EMULT_METHOD3) { // emult method 3 (abc) // C=A.*B or C<#M>=A.*B; B sparse/hyper; M and A bitmap/full // C is sparse - #include "GB_emult_03_template.c" + #include "ewise/template/GB_emult_03_template.c" } else if (ewise_method == GB_EMULT_METHOD4) { // C=A.*B; M sparse/hyper, A and B bitmap/full // C is sparse - #include "GB_emult_04_template.c" + #include "ewise/template/GB_emult_04_template.c" } else if (C_sparsity == GxB_BITMAP) { // C is bitmap: emult methods 5, 6, or 7 - #include "GB_emult_bitmap_template.c" + #include "ewise/template/GB_emult_bitmap_template.c" } else { // C is sparse: emult method 8 (abcdefgh) - #include "GB_emult_08_meta.c" + #include "ewise/template/GB_emult_08_meta.c" } } diff --git a/GraphBLAS/Source/GB_emult_iso.c b/GraphBLAS/Source/ewise/GB_emult_iso.c similarity index 99% rename from GraphBLAS/Source/GB_emult_iso.c rename to GraphBLAS/Source/ewise/GB_emult_iso.c index 1775f063c1..56e6183aec 100644 --- a/GraphBLAS/Source/GB_emult_iso.c +++ b/GraphBLAS/Source/ewise/GB_emult_iso.c @@ -11,7 +11,7 @@ // C=kron(A,B) results in an iso matrix C. If true, the output scalar c is the // iso value for the matrix C. -#include "GB_emult.h" +#include "ewise/GB_emult.h" bool GB_emult_iso // c = op(a,b), return true if C is iso ( diff --git a/GraphBLAS/Source/GB_emult_sparsity.c b/GraphBLAS/Source/ewise/GB_emult_sparsity.c similarity index 99% rename from GraphBLAS/Source/GB_emult_sparsity.c rename to GraphBLAS/Source/ewise/GB_emult_sparsity.c index 1a0b3cdf92..f36492cb74 100644 --- a/GraphBLAS/Source/GB_emult_sparsity.c +++ b/GraphBLAS/Source/ewise/GB_emult_sparsity.c @@ -21,8 +21,8 @@ // and as a result, there is no need for a GB_emult to handle the case when // C is full. -#include "GB_emult.h" -#include "GB_mask_very_sparse.h" +#include "ewise/GB_emult.h" +#include "mask/GB_mask_very_sparse.h" int GB_emult_sparsity // return the sparsity structure for C ( diff --git a/GraphBLAS/Source/GB_ewise.c b/GraphBLAS/Source/ewise/GB_ewise.c similarity index 99% rename from GraphBLAS/Source/GB_ewise.c rename to GraphBLAS/Source/ewise/GB_ewise.c index 80a0163293..c24eefbb7f 100644 --- a/GraphBLAS/Source/GB_ewise.c +++ b/GraphBLAS/Source/ewise/GB_ewise.c @@ -19,12 +19,12 @@ GB_Matrix_free (&MT) ; \ } -#include "GB_ewise.h" -#include "GB_add.h" -#include "GB_emult.h" -#include "GB_transpose.h" -#include "GB_accum_mask.h" -#include "GB_binop.h" +#include "ewise/GB_ewise.h" +#include "ewise/GB_add.h" +#include "ewise/GB_emult.h" +#include "transpose/GB_transpose.h" +#include "mask/GB_accum_mask.h" +#include "binaryop/GB_binop.h" GrB_Info GB_ewise // C = accum (C, A+B) or A.*B ( diff --git a/GraphBLAS/Source/GB_ewise.h b/GraphBLAS/Source/ewise/GB_ewise.h similarity index 100% rename from GraphBLAS/Source/GB_ewise.h rename to GraphBLAS/Source/ewise/GB_ewise.h diff --git a/GraphBLAS/Source/GB_ewise_fulla.c b/GraphBLAS/Source/ewise/GB_ewise_fulla.c similarity index 95% rename from GraphBLAS/Source/GB_ewise_fulla.c rename to GraphBLAS/Source/ewise/GB_ewise_fulla.c index 660f27a444..ec9d5161e2 100644 --- a/GraphBLAS/Source/GB_ewise_fulla.c +++ b/GraphBLAS/Source/ewise/GB_ewise_fulla.c @@ -11,11 +11,11 @@ // JIT: done. -#include "GB_ewise.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif GrB_Info GB_ewise_fulla // C += A+B, all matrices full @@ -104,7 +104,7 @@ GrB_Info GB_ewise_fulla // C += A+B, all matrices full op, false, &opcode, &xcode, &ycode, &zcode)) { #define GB_BINOP_SUBSET - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_ewise_fulln.c b/GraphBLAS/Source/ewise/GB_ewise_fulln.c similarity index 96% rename from GraphBLAS/Source/GB_ewise_fulln.c rename to GraphBLAS/Source/ewise/GB_ewise_fulln.c index 58d6dd88fc..99fa7c3f66 100644 --- a/GraphBLAS/Source/GB_ewise_fulln.c +++ b/GraphBLAS/Source/ewise/GB_ewise_fulln.c @@ -12,11 +12,11 @@ // C can have any sparsity on input; it becomes a full non-iso matrix on output. // C can have pending work, which is discarded. -#include "GB_ewise.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "ewise/GB_ewise.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_ALL ; @@ -129,7 +129,7 @@ GrB_Info GB_ewise_fulln // C = A+B if (GB_binop_builtin (A->type, false, B->type, false, op, false, &opcode, &xcode, &ycode, &zcode)) { - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif diff --git a/GraphBLAS/Source/GrB_Matrix_eWiseAdd.c b/GraphBLAS/Source/ewise/GrB_Matrix_eWiseAdd.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_eWiseAdd.c rename to GraphBLAS/Source/ewise/GrB_Matrix_eWiseAdd.c index f2caff05fc..54da87d3f4 100644 --- a/GraphBLAS/Source/GrB_Matrix_eWiseAdd.c +++ b/GraphBLAS/Source/ewise/GrB_Matrix_eWiseAdd.c @@ -9,8 +9,8 @@ // C = accum (C,A+B) and variations. -#include "GB_ewise.h" -#include "GB_get_mask.h" +#include "ewise/GB_ewise.h" +#include "mask/GB_get_mask.h" #define GB_EWISE(op) \ /* check inputs */ \ diff --git a/GraphBLAS/Source/GrB_Matrix_eWiseMult.c b/GraphBLAS/Source/ewise/GrB_Matrix_eWiseMult.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_eWiseMult.c rename to GraphBLAS/Source/ewise/GrB_Matrix_eWiseMult.c index 324f02abec..aab642981a 100644 --- a/GraphBLAS/Source/GrB_Matrix_eWiseMult.c +++ b/GraphBLAS/Source/ewise/GrB_Matrix_eWiseMult.c @@ -9,8 +9,8 @@ // C = accum (C,A.*B) and variations. -#include "GB_ewise.h" -#include "GB_get_mask.h" +#include "ewise/GB_ewise.h" +#include "mask/GB_get_mask.h" #define GB_EWISE(op) \ /* check inputs */ \ diff --git a/GraphBLAS/Source/GrB_Vector_eWiseAdd.c b/GraphBLAS/Source/ewise/GrB_Vector_eWiseAdd.c similarity index 99% rename from GraphBLAS/Source/GrB_Vector_eWiseAdd.c rename to GraphBLAS/Source/ewise/GrB_Vector_eWiseAdd.c index e4beecb451..ba1d3e0a3e 100644 --- a/GraphBLAS/Source/GrB_Vector_eWiseAdd.c +++ b/GraphBLAS/Source/ewise/GrB_Vector_eWiseAdd.c @@ -9,8 +9,8 @@ // w = accum (w,u+v) -#include "GB_ewise.h" -#include "GB_get_mask.h" +#include "ewise/GB_ewise.h" +#include "mask/GB_get_mask.h" #define GB_EWISE(op) \ /* check inputs */ \ diff --git a/GraphBLAS/Source/GrB_Vector_eWiseMult.c b/GraphBLAS/Source/ewise/GrB_Vector_eWiseMult.c similarity index 99% rename from GraphBLAS/Source/GrB_Vector_eWiseMult.c rename to GraphBLAS/Source/ewise/GrB_Vector_eWiseMult.c index b1633c86e6..e28930f9c8 100644 --- a/GraphBLAS/Source/GrB_Vector_eWiseMult.c +++ b/GraphBLAS/Source/ewise/GrB_Vector_eWiseMult.c @@ -9,8 +9,8 @@ // w = accum (w,u.*v) -#include "GB_ewise.h" -#include "GB_get_mask.h" +#include "ewise/GB_ewise.h" +#include "mask/GB_get_mask.h" #define GB_EWISE(op) \ /* check inputs */ \ diff --git a/GraphBLAS/Source/GxB_Matrix_eWiseUnion.c b/GraphBLAS/Source/ewise/GxB_Matrix_eWiseUnion.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_eWiseUnion.c rename to GraphBLAS/Source/ewise/GxB_Matrix_eWiseUnion.c index 28aff9f169..9f91bf6d04 100644 --- a/GraphBLAS/Source/GxB_Matrix_eWiseUnion.c +++ b/GraphBLAS/Source/ewise/GxB_Matrix_eWiseUnion.c @@ -25,8 +25,8 @@ // else if A(i,j) does not appear but B(i,j) does: // C(i,j) = B(i,j) -#include "GB_ewise.h" -#include "GB_get_mask.h" +#include "ewise/GB_ewise.h" +#include "mask/GB_get_mask.h" #define GB_EWISE(op) \ /* check inputs */ \ diff --git a/GraphBLAS/Source/GxB_Vector_eWiseUnion.c b/GraphBLAS/Source/ewise/GxB_Vector_eWiseUnion.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_eWiseUnion.c rename to GraphBLAS/Source/ewise/GxB_Vector_eWiseUnion.c index bb48b01d53..fb33508d17 100644 --- a/GraphBLAS/Source/GxB_Vector_eWiseUnion.c +++ b/GraphBLAS/Source/ewise/GxB_Vector_eWiseUnion.c @@ -16,8 +16,8 @@ // else if u(i) does not appear but v(i) does: // C(i,j) = add (alpha, v(i)) -#include "GB_ewise.h" -#include "GB_get_mask.h" +#include "ewise/GB_ewise.h" +#include "mask/GB_get_mask.h" #define GB_EWISE(op) \ /* check inputs */ \ diff --git a/GraphBLAS/Source/Shared/GB_ewise_shared_definitions.h b/GraphBLAS/Source/ewise/include/GB_ewise_shared_definitions.h similarity index 96% rename from GraphBLAS/Source/Shared/GB_ewise_shared_definitions.h rename to GraphBLAS/Source/ewise/include/GB_ewise_shared_definitions.h index ea17ab9a83..8b0e542512 100644 --- a/GraphBLAS/Source/Shared/GB_ewise_shared_definitions.h +++ b/GraphBLAS/Source/ewise/include/GB_ewise_shared_definitions.h @@ -12,7 +12,7 @@ // this file. This file is shared by generic, factory, and both CPU and // CUDA JIT kernels. -#include "GB_kernel_shared_definitions.h" +#include "include/GB_kernel_shared_definitions.h" #ifndef GB_EWISE_SHARED_DEFINITIONS_H #define GB_EWISE_SHARED_DEFINITIONS_H diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap.c similarity index 92% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap.c index 3d38a4394e..e9712e32ae 100644 --- a/GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap.c +++ b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap.c @@ -81,17 +81,17 @@ #if (GB_A_IS_BITMAP || GB_A_IS_FULL) && (GB_B_IS_BITMAP || GB_B_IS_FULL) { // A and B are both bitmap/full - #include "GB_add_bitmap_M_bitmap_27.c" + #include "template/GB_add_bitmap_M_bitmap_27.c" } #elif (GB_A_IS_BITMAP || GB_A_IS_FULL) { // A is bitmap/full, B is sparse/hyper - #include "GB_add_bitmap_M_bitmap_28.c" + #include "template/GB_add_bitmap_M_bitmap_28.c" } #else { // A is sparse/hyper, B is bitmap/full - #include "GB_add_bitmap_M_bitmap_29.c" + #include "template/GB_add_bitmap_M_bitmap_29.c" } #endif } @@ -100,17 +100,17 @@ if ((A_is_bitmap || A_is_full) && (B_is_bitmap || B_is_full)) { // A and B are both bitmap/full - #include "GB_add_bitmap_M_bitmap_27.c" + #include "template/GB_add_bitmap_M_bitmap_27.c" } else if (A_is_bitmap || A_is_full) { // A is bitmap/full, B is sparse/hyper - #include "GB_add_bitmap_M_bitmap_28.c" + #include "template/GB_add_bitmap_M_bitmap_28.c" } else { // A is sparse/hyper, B is bitmap/full - #include "GB_add_bitmap_M_bitmap_29.c" + #include "template/GB_add_bitmap_M_bitmap_29.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap_27.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap_27.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap_27.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap_27.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap_28.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap_28.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap_28.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap_28.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap_29.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap_29.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_bitmap_29.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_bitmap_29.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_sparse.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse.c similarity index 94% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_sparse.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse.c index 5ad543bac4..58d60737df 100644 --- a/GraphBLAS/Source/Template/GB_add_bitmap_M_sparse.c +++ b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse.c @@ -86,19 +86,19 @@ #if (GB_A_IS_BITMAP || GB_A_IS_FULL) && (GB_B_IS_BITMAP || GB_B_IS_FULL) { // A and B are both bitmap/full - #include "GB_add_bitmap_M_sparse_24.c" + #include "template/GB_add_bitmap_M_sparse_24.c" #define M_cleared true } #elif (GB_A_IS_BITMAP || GB_A_IS_FULL) { // A is bitmap/full, B is sparse/hyper - #include "GB_add_bitmap_M_sparse_25.c" + #include "template/GB_add_bitmap_M_sparse_25.c" #define M_cleared false } #else { // A is sparse/hyper, B is bitmap/full - #include "GB_add_bitmap_M_sparse_26.c" + #include "template/GB_add_bitmap_M_sparse_26.c" #define M_cleared false } #endif @@ -109,18 +109,18 @@ if ((A_is_bitmap || A_is_full) && (B_is_bitmap || B_is_full)) { // A and B are both bitmap/full - #include "GB_add_bitmap_M_sparse_24.c" + #include "template/GB_add_bitmap_M_sparse_24.c" M_cleared = true ; // M has also been cleared from C } else if (A_is_bitmap || A_is_full) { // A is bitmap/full, B is sparse/hyper - #include "GB_add_bitmap_M_sparse_25.c" + #include "template/GB_add_bitmap_M_sparse_25.c" } else { // A is sparse/hyper, B is bitmap/full - #include "GB_add_bitmap_M_sparse_26.c" + #include "template/GB_add_bitmap_M_sparse_26.c" } #endif diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_sparse_24.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse_24.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_sparse_24.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse_24.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_sparse_25.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse_25.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_sparse_25.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse_25.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_M_sparse_26.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse_26.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_M_sparse_26.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_M_sparse_26.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_noM.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_noM.c similarity index 82% rename from GraphBLAS/Source/Template/GB_add_bitmap_noM.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_noM.c index f191d37cc2..1f27120332 100644 --- a/GraphBLAS/Source/Template/GB_add_bitmap_noM.c +++ b/GraphBLAS/Source/ewise/template/GB_add_bitmap_noM.c @@ -28,17 +28,17 @@ #if (GB_A_IS_BITMAP && GB_B_IS_BITMAP) { // A and B are both bitmap - #include "GB_add_bitmap_noM_21.c" + #include "template/GB_add_bitmap_noM_21.c" } #elif (GB_A_IS_BITMAP) { // A is bitmap, B is sparse/hyper - #include "GB_add_bitmap_noM_22.c" + #include "template/GB_add_bitmap_noM_22.c" } #else { // A is sparse/hyper, B is bitmap - #include "GB_add_bitmap_noM_23.c" + #include "template/GB_add_bitmap_noM_23.c" } #endif } @@ -47,17 +47,17 @@ if (A_is_bitmap && B_is_bitmap) { // A and B are both bitmap - #include "GB_add_bitmap_noM_21.c" + #include "template/GB_add_bitmap_noM_21.c" } else if (A_is_bitmap) { // A is bitmap, B is sparse/hyper - #include "GB_add_bitmap_noM_22.c" + #include "template/GB_add_bitmap_noM_22.c" } else { // A is sparse/hyper, B is bitmap - #include "GB_add_bitmap_noM_23.c" + #include "template/GB_add_bitmap_noM_23.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_noM_21.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_noM_21.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_noM_21.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_noM_21.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_noM_22.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_noM_22.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_noM_22.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_noM_22.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_noM_23.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_noM_23.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_bitmap_noM_23.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_noM_23.c diff --git a/GraphBLAS/Source/Template/GB_add_bitmap_template.c b/GraphBLAS/Source/ewise/template/GB_add_bitmap_template.c similarity index 85% rename from GraphBLAS/Source/Template/GB_add_bitmap_template.c rename to GraphBLAS/Source/ewise/template/GB_add_bitmap_template.c index 39e2f3613d..9aa944352c 100644 --- a/GraphBLAS/Source/Template/GB_add_bitmap_template.c +++ b/GraphBLAS/Source/ewise/template/GB_add_bitmap_template.c @@ -24,19 +24,19 @@ { // M is not present. // A or B is bitmap (or both). Neither A nor B are full. - #include "GB_add_bitmap_noM.c" + #include "template/GB_add_bitmap_noM.c" } #elif (GB_M_IS_SPARSE || GB_M_IS_HYPER) { // M is sparse/hyper and complemented, value/structural. // A and B can have any format, except at least one is bitmap/full. - #include "GB_add_bitmap_M_sparse.c" + #include "template/GB_add_bitmap_M_sparse.c" } #else { // M is bitmap/full, complemented or not, and valued/structural. // A and B have any sparsity format but at least one is bitmap/full. - #include "GB_add_bitmap_M_bitmap.c" + #include "template/GB_add_bitmap_M_bitmap.c" } #endif @@ -48,19 +48,19 @@ { // M is not present. // A or B is bitmap (or both). Neither A nor B are full. - #include "GB_add_bitmap_noM.c" + #include "template/GB_add_bitmap_noM.c" } else if (M_is_sparse_or_hyper) { // M is sparse/hyper and complemented, value/structural. // A and B can have any format, except at least one is bitmap/full. - #include "GB_add_bitmap_M_sparse.c" + #include "template/GB_add_bitmap_M_sparse.c" } else { // M is bitmap/full, complemented or not, and valued/structural. // A and B have any sparsity format but at least one is bitmap/full. - #include "GB_add_bitmap_M_bitmap.c" + #include "template/GB_add_bitmap_M_bitmap.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_add_full_30.c b/GraphBLAS/Source/ewise/template/GB_add_full_30.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_full_30.c rename to GraphBLAS/Source/ewise/template/GB_add_full_30.c diff --git a/GraphBLAS/Source/Template/GB_add_full_31.c b/GraphBLAS/Source/ewise/template/GB_add_full_31.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_full_31.c rename to GraphBLAS/Source/ewise/template/GB_add_full_31.c diff --git a/GraphBLAS/Source/Template/GB_add_full_32.c b/GraphBLAS/Source/ewise/template/GB_add_full_32.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_full_32.c rename to GraphBLAS/Source/ewise/template/GB_add_full_32.c diff --git a/GraphBLAS/Source/Template/GB_add_full_33.c b/GraphBLAS/Source/ewise/template/GB_add_full_33.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_full_33.c rename to GraphBLAS/Source/ewise/template/GB_add_full_33.c diff --git a/GraphBLAS/Source/Template/GB_add_full_34.c b/GraphBLAS/Source/ewise/template/GB_add_full_34.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_full_34.c rename to GraphBLAS/Source/ewise/template/GB_add_full_34.c diff --git a/GraphBLAS/Source/Template/GB_add_full_template.c b/GraphBLAS/Source/ewise/template/GB_add_full_template.c similarity index 84% rename from GraphBLAS/Source/Template/GB_add_full_template.c rename to GraphBLAS/Source/ewise/template/GB_add_full_template.c index 295bbf63ae..fb9601ff22 100644 --- a/GraphBLAS/Source/Template/GB_add_full_template.c +++ b/GraphBLAS/Source/ewise/template/GB_add_full_template.c @@ -33,7 +33,7 @@ #if (GB_A_IS_FULL && GB_B_IS_FULL) { // C, A, and B are all full - #include "GB_add_full_30.c" + #include "template/GB_add_full_30.c" } #elif (GB_A_IS_FULL) { @@ -41,12 +41,12 @@ #if (GB_B_IS_BITMAP) { // C and A are full; B is bitmap - #include "GB_add_full_31.c" + #include "template/GB_add_full_31.c" } #else { // C and A are full; B is sparse or hypersparse - #include "GB_add_full_32.c" + #include "template/GB_add_full_32.c" } #endif } @@ -56,12 +56,12 @@ #if (GB_A_IS_BITMAP) { // C and B are full; A is bitmap - #include "GB_add_full_33.c" + #include "template/GB_add_full_33.c" } #else { // C and B are full; A is hypersparse or sparse - #include "GB_add_full_34.c" + #include "template/GB_add_full_34.c" } #endif } @@ -72,7 +72,7 @@ if (A_is_full && B_is_full) { // C, A, and B are all full - #include "GB_add_full_30.c" + #include "template/GB_add_full_30.c" } else if (A_is_full) { @@ -80,12 +80,12 @@ if (B_is_bitmap) { // C and A are full; B is bitmap - #include "GB_add_full_31.c" + #include "template/GB_add_full_31.c" } else { // C and A are full; B is sparse or hypersparse - #include "GB_add_full_32.c" + #include "template/GB_add_full_32.c" } } else @@ -94,12 +94,12 @@ if (A_is_bitmap) { // C and B are full; A is bitmap - #include "GB_add_full_33.c" + #include "template/GB_add_full_33.c" } else { // C and B are full; A is hypersparse or sparse - #include "GB_add_full_34.c" + #include "template/GB_add_full_34.c" } } } diff --git a/GraphBLAS/Source/Template/GB_add_sparse_M_bitmap.c b/GraphBLAS/Source/ewise/template/GB_add_sparse_M_bitmap.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_sparse_M_bitmap.c rename to GraphBLAS/Source/ewise/template/GB_add_sparse_M_bitmap.c diff --git a/GraphBLAS/Source/Template/GB_add_sparse_M_sparse.c b/GraphBLAS/Source/ewise/template/GB_add_sparse_M_sparse.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_sparse_M_sparse.c rename to GraphBLAS/Source/ewise/template/GB_add_sparse_M_sparse.c diff --git a/GraphBLAS/Source/Template/GB_add_sparse_noM.c b/GraphBLAS/Source/ewise/template/GB_add_sparse_noM.c similarity index 100% rename from GraphBLAS/Source/Template/GB_add_sparse_noM.c rename to GraphBLAS/Source/ewise/template/GB_add_sparse_noM.c diff --git a/GraphBLAS/Source/Template/GB_add_sparse_template.c b/GraphBLAS/Source/ewise/template/GB_add_sparse_template.c similarity index 95% rename from GraphBLAS/Source/Template/GB_add_sparse_template.c rename to GraphBLAS/Source/ewise/template/GB_add_sparse_template.c index 1741abc40d..58d3e94183 100644 --- a/GraphBLAS/Source/Template/GB_add_sparse_template.c +++ b/GraphBLAS/Source/ewise/template/GB_add_sparse_template.c @@ -193,15 +193,15 @@ { #if GB_NO_MASK { - #include "GB_add_sparse_noM.c" + #include "template/GB_add_sparse_noM.c" } #elif (GB_M_IS_SPARSE || GB_M_IS_HYPER) { - #include "GB_add_sparse_M_sparse.c" + #include "template/GB_add_sparse_M_sparse.c" } #else { - #include "GB_add_sparse_M_bitmap.c" + #include "template/GB_add_sparse_M_bitmap.c" } #endif } @@ -209,15 +209,15 @@ { if (M == NULL) { - #include "GB_add_sparse_noM.c" + #include "template/GB_add_sparse_noM.c" } else if (M_is_sparse_or_hyper) { - #include "GB_add_sparse_M_sparse.c" + #include "template/GB_add_sparse_M_sparse.c" } else { - #include "GB_add_sparse_M_bitmap.c" + #include "template/GB_add_sparse_M_bitmap.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_add_template.c b/GraphBLAS/Source/ewise/template/GB_add_template.c similarity index 94% rename from GraphBLAS/Source/Template/GB_add_template.c rename to GraphBLAS/Source/ewise/template/GB_add_template.c index b6d8d1ebf9..633d9a06fe 100644 --- a/GraphBLAS/Source/Template/GB_add_template.c +++ b/GraphBLAS/Source/ewise/template/GB_add_template.c @@ -149,7 +149,7 @@ // phase1: symbolic phase // C is sparse or hypersparse (never bitmap or full) - #include "GB_add_sparse_template.c" + #include "template/GB_add_sparse_template.c" #else @@ -172,15 +172,15 @@ { #if GB_C_IS_SPARSE || GB_C_IS_HYPER { - #include "GB_add_sparse_template.c" + #include "template/GB_add_sparse_template.c" } #elif GB_C_IS_BITMAP { - #include "GB_add_bitmap_template.c" + #include "template/GB_add_bitmap_template.c" } #else { - #include "GB_add_full_template.c" + #include "template/GB_add_full_template.c" } #endif } @@ -189,18 +189,18 @@ if (C_sparsity == GxB_SPARSE || C_sparsity == GxB_HYPERSPARSE) { // C is sparse or hypersparse - #include "GB_add_sparse_template.c" + #include "template/GB_add_sparse_template.c" } else if (C_sparsity == GxB_BITMAP) { // C is bitmap (phase2 only) - #include "GB_add_bitmap_template.c" + #include "template/GB_add_bitmap_template.c" } else { // C is full (phase2 only), and not iso ASSERT (C_sparsity == GxB_FULL) ; - #include "GB_add_full_template.c" + #include "template/GB_add_full_template.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_emult_02_template.c b/GraphBLAS/Source/ewise/template/GB_emult_02_template.c similarity index 90% rename from GraphBLAS/Source/Template/GB_emult_02_template.c rename to GraphBLAS/Source/ewise/template/GB_emult_02_template.c index 38591794ec..ee5eeb8720 100644 --- a/GraphBLAS/Source/Template/GB_emult_02_template.c +++ b/GraphBLAS/Source/ewise/template/GB_emult_02_template.c @@ -64,19 +64,19 @@ #if GB_B_IS_BITMAP { // C=A.*B, where A is sparse/hyper and B is bitmap - #include "GB_emult_02a.c" + #include "template/GB_emult_02a.c" } #else { // C=A.*B, where A is sparse/hyper and B is full - #include "GB_emult_02b.c" + #include "template/GB_emult_02b.c" } #endif } #else { // C<#M>=A.*B, where A is sparse/hyper; M and B are bitmap/full - #include "GB_emult_02c.c" + #include "template/GB_emult_02c.c" } #endif @@ -87,18 +87,18 @@ if (GB_IS_BITMAP (B)) { // C=A.*B, where A is sparse/hyper and B is bitmap - #include "GB_emult_02a.c" + #include "template/GB_emult_02a.c" } else { // C=A.*B, where A is sparse/hyper and B is full - #include "GB_emult_02b.c" + #include "template/GB_emult_02b.c" } } else { // C<#M>=A.*B, where A is sparse/hyper; M and B are bitmap/full - #include "GB_emult_02c.c" + #include "template/GB_emult_02c.c" } #endif diff --git a/GraphBLAS/Source/Template/GB_emult_02a.c b/GraphBLAS/Source/ewise/template/GB_emult_02a.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_02a.c rename to GraphBLAS/Source/ewise/template/GB_emult_02a.c diff --git a/GraphBLAS/Source/Template/GB_emult_02b.c b/GraphBLAS/Source/ewise/template/GB_emult_02b.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_02b.c rename to GraphBLAS/Source/ewise/template/GB_emult_02b.c diff --git a/GraphBLAS/Source/Template/GB_emult_02c.c b/GraphBLAS/Source/ewise/template/GB_emult_02c.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_02c.c rename to GraphBLAS/Source/ewise/template/GB_emult_02c.c diff --git a/GraphBLAS/Source/Template/GB_emult_03_template.c b/GraphBLAS/Source/ewise/template/GB_emult_03_template.c similarity index 90% rename from GraphBLAS/Source/Template/GB_emult_03_template.c rename to GraphBLAS/Source/ewise/template/GB_emult_03_template.c index 3bd9a4107d..3640aa8f9e 100644 --- a/GraphBLAS/Source/Template/GB_emult_03_template.c +++ b/GraphBLAS/Source/ewise/template/GB_emult_03_template.c @@ -64,19 +64,19 @@ #if GB_A_IS_BITMAP { // C=A.*B, where A is bitmap and B is sparse/hyper - #include "GB_emult_03a.c" + #include "template/GB_emult_03a.c" } #else { // C=A.*B, where A is full and B is sparse/hyper - #include "GB_emult_03b.c" + #include "template/GB_emult_03b.c" } #endif } #else { // C<#M>=A.*B, where M and A are bitmap/full and B is sparse/hyper - #include "GB_emult_03c.c" + #include "template/GB_emult_03c.c" } #endif @@ -87,18 +87,18 @@ if (GB_IS_BITMAP (A)) { // C=A.*B, where A is bitmap and B is sparse/hyper - #include "GB_emult_03a.c" + #include "template/GB_emult_03a.c" } else { // C=A.*B, where A is full and B is sparse/hyper - #include "GB_emult_03b.c" + #include "template/GB_emult_03b.c" } } else { // C<#M>=A.*B, where M and A are bitmap/full and B is sparse/hyper - #include "GB_emult_03c.c" + #include "template/GB_emult_03c.c" } #endif diff --git a/GraphBLAS/Source/Template/GB_emult_03a.c b/GraphBLAS/Source/ewise/template/GB_emult_03a.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_03a.c rename to GraphBLAS/Source/ewise/template/GB_emult_03a.c diff --git a/GraphBLAS/Source/Template/GB_emult_03b.c b/GraphBLAS/Source/ewise/template/GB_emult_03b.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_03b.c rename to GraphBLAS/Source/ewise/template/GB_emult_03b.c diff --git a/GraphBLAS/Source/Template/GB_emult_03c.c b/GraphBLAS/Source/ewise/template/GB_emult_03c.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_03c.c rename to GraphBLAS/Source/ewise/template/GB_emult_03c.c diff --git a/GraphBLAS/Source/Template/GB_emult_04_template.c b/GraphBLAS/Source/ewise/template/GB_emult_04_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_04_template.c rename to GraphBLAS/Source/ewise/template/GB_emult_04_template.c diff --git a/GraphBLAS/Source/Template/GB_emult_08_meta.c b/GraphBLAS/Source/ewise/template/GB_emult_08_meta.c similarity index 97% rename from GraphBLAS/Source/Template/GB_emult_08_meta.c rename to GraphBLAS/Source/ewise/template/GB_emult_08_meta.c index 0dc789885f..322e9b43d8 100644 --- a/GraphBLAS/Source/Template/GB_emult_08_meta.c +++ b/GraphBLAS/Source/ewise/template/GB_emult_08_meta.c @@ -22,7 +22,7 @@ { // iB_first is unused if the operator is FIRST or PAIR - #include "GB_unused.h" + #include "include/GB_unused.h" //-------------------------------------------------------------------------- // get A, B, M, and C @@ -131,12 +131,12 @@ #if ( GB_EMULT_08_PHASE == 1 ) { // phase1: symbolic phase - #include "GB_emult_08_template.c" + #include "template/GB_emult_08_template.c" } #else { // phase2: numerical phase - #include "GB_emult_08_template.c" + #include "template/GB_emult_08_template.c" } #endif } diff --git a/GraphBLAS/Source/Template/GB_emult_08_template.c b/GraphBLAS/Source/ewise/template/GB_emult_08_template.c similarity index 96% rename from GraphBLAS/Source/Template/GB_emult_08_template.c rename to GraphBLAS/Source/ewise/template/GB_emult_08_template.c index 3916c7308d..44027ca605 100644 --- a/GraphBLAS/Source/Template/GB_emult_08_template.c +++ b/GraphBLAS/Source/ewise/template/GB_emult_08_template.c @@ -217,18 +217,18 @@ #if GB_NO_MASK { // C=A.*B, all matrices sparse/hyper - #include "GB_emult_08bcd.c" + #include "template/GB_emult_08bcd.c" } #elif (GB_M_IS_SPARSE || GB_M_IS_HYPER) { // C=A.*B, C and M are sparse/hyper // either A or B are sparse/hyper - #include "GB_emult_08e.c" + #include "template/GB_emult_08e.c" } #else { // C<#M>=A.*B; C, A and B are sparse/hyper; M is bitmap/full - #include "GB_emult_08fgh.c" + #include "template/GB_emult_08fgh.c" } #endif } @@ -237,18 +237,18 @@ if (M == NULL) { // C=A.*B, all matrices sparse/hyper - #include "GB_emult_08bcd.c" + #include "template/GB_emult_08bcd.c" } else if (M_is_sparse_or_hyper) { // C=A.*B, C and M are sparse/hyper // either A or B are sparse/hyper - #include "GB_emult_08e.c" + #include "template/GB_emult_08e.c" } else { // C<#M>=A.*B; C, A and B are sparse/hyper; M is bitmap/full - #include "GB_emult_08fgh.c" + #include "template/GB_emult_08fgh.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_emult_08bcd.c b/GraphBLAS/Source/ewise/template/GB_emult_08bcd.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_08bcd.c rename to GraphBLAS/Source/ewise/template/GB_emult_08bcd.c diff --git a/GraphBLAS/Source/Template/GB_emult_08e.c b/GraphBLAS/Source/ewise/template/GB_emult_08e.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_08e.c rename to GraphBLAS/Source/ewise/template/GB_emult_08e.c diff --git a/GraphBLAS/Source/Template/GB_emult_08fgh.c b/GraphBLAS/Source/ewise/template/GB_emult_08fgh.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_08fgh.c rename to GraphBLAS/Source/ewise/template/GB_emult_08fgh.c diff --git a/GraphBLAS/Source/Template/GB_emult_bitmap_5.c b/GraphBLAS/Source/ewise/template/GB_emult_bitmap_5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_bitmap_5.c rename to GraphBLAS/Source/ewise/template/GB_emult_bitmap_5.c diff --git a/GraphBLAS/Source/Template/GB_emult_bitmap_6.c b/GraphBLAS/Source/ewise/template/GB_emult_bitmap_6.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_bitmap_6.c rename to GraphBLAS/Source/ewise/template/GB_emult_bitmap_6.c diff --git a/GraphBLAS/Source/Template/GB_emult_bitmap_7.c b/GraphBLAS/Source/ewise/template/GB_emult_bitmap_7.c similarity index 100% rename from GraphBLAS/Source/Template/GB_emult_bitmap_7.c rename to GraphBLAS/Source/ewise/template/GB_emult_bitmap_7.c diff --git a/GraphBLAS/Source/Template/GB_emult_bitmap_template.c b/GraphBLAS/Source/ewise/template/GB_emult_bitmap_template.c similarity index 90% rename from GraphBLAS/Source/Template/GB_emult_bitmap_template.c rename to GraphBLAS/Source/ewise/template/GB_emult_bitmap_template.c index fb9d20e9cd..bab484f47b 100644 --- a/GraphBLAS/Source/Template/GB_emult_bitmap_template.c +++ b/GraphBLAS/Source/ewise/template/GB_emult_bitmap_template.c @@ -61,17 +61,17 @@ #if GB_NO_MASK { // C=A.*B; C bitmap, M not present, A and B are bitmap/full - #include "GB_emult_bitmap_5.c" + #include "template/GB_emult_bitmap_5.c" } #elif GB_M_IS_SPARSE || GB_M_IS_HYPER { // C=A.*B; C bitmap, M sparse/hyper, A and B are bitmap/full - #include "GB_emult_bitmap_6.c" + #include "template/GB_emult_bitmap_6.c" } #else { // C<#M>=A.*B; C bitmap; M, A, and B are all bitmap/full - #include "GB_emult_bitmap_7.c" + #include "template/GB_emult_bitmap_7.c" } #endif } @@ -80,17 +80,17 @@ if (M == NULL) { // C=A.*B; C bitmap, M not present, A and B are bitmap/full - #include "GB_emult_bitmap_5.c" + #include "template/GB_emult_bitmap_5.c" } else if (GB_IS_SPARSE (M) || GB_IS_HYPERSPARSE (M)) { // C=A.*B; C bitmap, M sparse/hyper, A and B are bitmap/full - #include "GB_emult_bitmap_6.c" + #include "template/GB_emult_bitmap_6.c" } else { // C<#M>=A.*B; C bitmap; M, A, and B are all bitmap/full - #include "GB_emult_bitmap_7.c" + #include "template/GB_emult_bitmap_7.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_ewise_fulla_template.c b/GraphBLAS/Source/ewise/template/GB_ewise_fulla_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_ewise_fulla_template.c rename to GraphBLAS/Source/ewise/template/GB_ewise_fulla_template.c diff --git a/GraphBLAS/Source/Template/GB_ewise_fulln_template.c b/GraphBLAS/Source/ewise/template/GB_ewise_fulln_template.c similarity index 98% rename from GraphBLAS/Source/Template/GB_ewise_fulln_template.c rename to GraphBLAS/Source/ewise/template/GB_ewise_fulln_template.c index 044f40170f..0e73d5b45b 100644 --- a/GraphBLAS/Source/Template/GB_ewise_fulln_template.c +++ b/GraphBLAS/Source/ewise/template/GB_ewise_fulln_template.c @@ -9,7 +9,7 @@ // This template is not used for any generic kernels. -#include "GB_unused.h" +#include "include/GB_unused.h" { diff --git a/GraphBLAS/Source/GB_I_inverse.c b/GraphBLAS/Source/extract/GB_I_inverse.c similarity index 99% rename from GraphBLAS/Source/GB_I_inverse.c rename to GraphBLAS/Source/extract/GB_I_inverse.c index a3021fbf94..2798e238e4 100644 --- a/GraphBLAS/Source/GB_I_inverse.c +++ b/GraphBLAS/Source/extract/GB_I_inverse.c @@ -17,7 +17,7 @@ // duplicates in I, and then construct the buckets in parallel after the qsort. // But the time complexity would be higher. -#include "GB_subref.h" +#include "extract/GB_subref.h" GrB_Info GB_I_inverse // invert the I list for C=A(I,:) ( diff --git a/GraphBLAS/Source/GB_bitmap_subref.c b/GraphBLAS/Source/extract/GB_bitmap_subref.c similarity index 96% rename from GraphBLAS/Source/GB_bitmap_subref.c rename to GraphBLAS/Source/extract/GB_bitmap_subref.c index 3b47875534..e5801b8b8c 100644 --- a/GraphBLAS/Source/GB_bitmap_subref.c +++ b/GraphBLAS/Source/extract/GB_bitmap_subref.c @@ -12,8 +12,8 @@ // JIT: needed. -#include "GB_subref.h" -#include "GB_subassign_IxJ_slice.h" +#include "extract/GB_subref.h" +#include "assign/GB_subassign_IxJ_slice.h" #define GB_FREE_ALL \ { \ @@ -153,7 +153,7 @@ GrB_Info GB_bitmap_subref // C = A(I,J): either symbolic or numeric Cx [pC] = pA ; \ task_cnvals += ab ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else #endif @@ -173,7 +173,7 @@ GrB_Info GB_bitmap_subref // C = A(I,J): either symbolic or numeric Cb [pC] = ab ; \ task_cnvals += ab ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else @@ -197,7 +197,7 @@ GrB_Info GB_bitmap_subref // C = A(I,J): either symbolic or numeric task_cnvals++ ; \ } \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } @@ -224,7 +224,7 @@ GrB_Info GB_bitmap_subref // C = A(I,J): either symbolic or numeric { \ Cx [pC] = pA ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } else if (C_iso) @@ -252,7 +252,7 @@ GrB_Info GB_bitmap_subref // C = A(I,J): either symbolic or numeric /* Cx [pC] = Ax [pA] */ \ memcpy (Cx +((pC)*asize), Ax +((pA)*asize), asize) ; \ } - #include "GB_bitmap_assign_IxJ_template.c" + #include "assign/factory/GB_bitmap_assign_IxJ_template.c" } } diff --git a/GraphBLAS/Source/GB_extract.c b/GraphBLAS/Source/extract/GB_extract.c similarity index 98% rename from GraphBLAS/Source/GB_extract.c rename to GraphBLAS/Source/extract/GB_extract.c index a649bd22b9..a8b2db12c4 100644 --- a/GraphBLAS/Source/GB_extract.c +++ b/GraphBLAS/Source/extract/GB_extract.c @@ -19,9 +19,9 @@ #define GB_FREE_ALL GrB_Matrix_free (&T) ; -#include "GB_extract.h" -#include "GB_subref.h" -#include "GB_accum_mask.h" +#include "extract/GB_extract.h" +#include "extract/GB_subref.h" +#include "mask/GB_accum_mask.h" GrB_Info GB_extract // C = accum (C, A(I,J)) ( diff --git a/GraphBLAS/Source/GB_extract.h b/GraphBLAS/Source/extract/GB_extract.h similarity index 100% rename from GraphBLAS/Source/GB_extract.h rename to GraphBLAS/Source/extract/GB_extract.h diff --git a/GraphBLAS/Source/GB_subref.c b/GraphBLAS/Source/extract/GB_subref.c similarity index 99% rename from GraphBLAS/Source/GB_subref.c rename to GraphBLAS/Source/extract/GB_subref.c index 46dc4fe751..c96e10bea6 100644 --- a/GraphBLAS/Source/GB_subref.c +++ b/GraphBLAS/Source/extract/GB_subref.c @@ -86,7 +86,7 @@ GB_FREE_WORKSPACE ; \ } -#include "GB_subref.h" +#include "extract/GB_subref.h" GrB_Info GB_subref // C = A(I,J): either symbolic or numeric ( diff --git a/GraphBLAS/Source/GB_subref.h b/GraphBLAS/Source/extract/GB_subref.h similarity index 99% rename from GraphBLAS/Source/GB_subref.h rename to GraphBLAS/Source/extract/GB_subref.h index f2a8d3cae6..04304dec69 100644 --- a/GraphBLAS/Source/GB_subref.h +++ b/GraphBLAS/Source/extract/GB_subref.h @@ -9,7 +9,7 @@ #ifndef GB_SUBREF_H #define GB_SUBREF_H -#include "GB_ij.h" +#include "ij/GB_ij.h" GrB_Info GB_subref // C = A(I,J): either symbolic or numeric ( diff --git a/GraphBLAS/Source/GB_subref_phase0.c b/GraphBLAS/Source/extract/GB_subref_phase0.c similarity index 99% rename from GraphBLAS/Source/GB_subref_phase0.c rename to GraphBLAS/Source/extract/GB_subref_phase0.c index b85999dc8c..825474fd3a 100644 --- a/GraphBLAS/Source/GB_subref_phase0.c +++ b/GraphBLAS/Source/extract/GB_subref_phase0.c @@ -9,7 +9,7 @@ // JIT: not needed. Only one variant possible. -#include "GB_subref.h" +#include "extract/GB_subref.h" #define GB_Ai(p) GBI_UNFLIP (Ai, p, avlen) diff --git a/GraphBLAS/Source/GB_subref_phase2.c b/GraphBLAS/Source/extract/GB_subref_phase2.c similarity index 96% rename from GraphBLAS/Source/GB_subref_phase2.c rename to GraphBLAS/Source/extract/GB_subref_phase2.c index 29c1a9f787..dcc337461a 100644 --- a/GraphBLAS/Source/GB_subref_phase2.c +++ b/GraphBLAS/Source/extract/GB_subref_phase2.c @@ -14,7 +14,7 @@ // Cp is either freed by phase2, or transplanted into C. -#include "GB_subref.h" +#include "extract/GB_subref.h" GrB_Info GB_subref_phase2 // count nnz in each C(:,j) ( @@ -78,13 +78,13 @@ GrB_Info GB_subref_phase2 // count nnz in each C(:,j) #define GB_SYMBOLIC // symbolic extraction must handle zombies const int64_t nzombies = A->nzombies ; - #include "GB_subref_template.c" + #include "extract/factory/GB_subref_template.c" } else { // iso and non-iso numeric extraction do not see zombies ASSERT (!GB_ZOMBIES (A)) ; - #include "GB_subref_template.c" + #include "extract/factory/GB_subref_template.c" } //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/GB_subref_phase3.c b/GraphBLAS/Source/extract/GB_subref_phase3.c similarity index 96% rename from GraphBLAS/Source/GB_subref_phase3.c rename to GraphBLAS/Source/extract/GB_subref_phase3.c index 8747efc815..323f917f63 100644 --- a/GraphBLAS/Source/GB_subref_phase3.c +++ b/GraphBLAS/Source/extract/GB_subref_phase3.c @@ -12,9 +12,9 @@ // This function either frees Cp and Ch, or transplants then into C, as C->p // and C->h. Either way, the caller must not free them. -#include "GB_subref.h" -#include "GB_sort.h" -#include "GB_unused.h" +#include "extract/GB_subref.h" +#include "sort/GB_sort.h" +#include "include/GB_unused.h" GrB_Info GB_subref_phase3 // C=A(I,J) ( @@ -139,7 +139,7 @@ GrB_Info GB_subref_phase3 // C=A(I,J) #define GB_CSIZE1 1 #define GB_CSIZE2 (sizeof (int64_t)) #define GB_SYMBOLIC - #include "GB_subref_template.c" + #include "extract/factory/GB_subref_template.c" } else if (C_iso) @@ -154,7 +154,7 @@ GrB_Info GB_subref_phase3 // C=A(I,J) #define GB_COPY_RANGE(pC,pA,len) ; #define GB_COPY_ENTRY(pC,pA) ; #define GB_ISO_SUBREF - #include "GB_subref_template.c" + #include "extract/factory/GB_subref_template.c" } else @@ -178,7 +178,7 @@ GrB_Info GB_subref_phase3 // C=A(I,J) memcpy (Cx + (pC)*asize, Ax + (pA)*asize, asize) ; #define GB_CSIZE1 asize #define GB_CSIZE2 asize - #include "GB_subref_template.c" + #include "extract/factory/GB_subref_template.c" } //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/GB_subref_slice.c b/GraphBLAS/Source/extract/GB_subref_slice.c similarity index 99% rename from GraphBLAS/Source/GB_subref_slice.c rename to GraphBLAS/Source/extract/GB_subref_slice.c index f158ff5da8..add4b745c9 100644 --- a/GraphBLAS/Source/GB_subref_slice.c +++ b/GraphBLAS/Source/extract/GB_subref_slice.c @@ -45,7 +45,7 @@ GB_FREE_WORK (&Inext, Inext_size) ; \ } -#include "GB_subref.h" +#include "extract/GB_subref.h" GrB_Info GB_subref_slice // phase 1 of GB_subref ( @@ -264,7 +264,7 @@ GrB_Info GB_subref_slice // phase 1 of GB_subref GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (Coarse, Cwork, Cnvec, ntasks1, false) ; + GB_p_slice (Coarse, Cwork, Cnvec, ntasks1, false) ; //-------------------------------------------------------------------------- // construct all tasks, both coarse and fine diff --git a/GraphBLAS/Source/GrB_Col_extract.c b/GraphBLAS/Source/extract/GrB_Col_extract.c similarity index 98% rename from GraphBLAS/Source/GrB_Col_extract.c rename to GraphBLAS/Source/extract/GrB_Col_extract.c index 377958be53..f7e4f64c6a 100644 --- a/GraphBLAS/Source/GrB_Col_extract.c +++ b/GraphBLAS/Source/extract/GrB_Col_extract.c @@ -12,8 +12,8 @@ // implementation, both are the same as an n-by-1 GrB_Matrix, except with // restrictions on the matrix operations that can be performed on them. -#include "GB_extract.h" -#include "GB_get_mask.h" +#include "extract/GB_extract.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Col_extract // w = accum (w, A(I,j)) or (A(j,I))' ( diff --git a/GraphBLAS/Source/GrB_Matrix_extract.c b/GraphBLAS/Source/extract/GrB_Matrix_extract.c similarity index 97% rename from GraphBLAS/Source/GrB_Matrix_extract.c rename to GraphBLAS/Source/extract/GrB_Matrix_extract.c index 20f9e30d53..cd087d7ad6 100644 --- a/GraphBLAS/Source/GrB_Matrix_extract.c +++ b/GraphBLAS/Source/extract/GrB_Matrix_extract.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_extract.h" -#include "GB_get_mask.h" +#include "extract/GB_extract.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Matrix_extract // C = accum (C, A(I,J)) ( diff --git a/GraphBLAS/Source/GrB_Vector_extract.c b/GraphBLAS/Source/extract/GrB_Vector_extract.c similarity index 97% rename from GraphBLAS/Source/GrB_Vector_extract.c rename to GraphBLAS/Source/extract/GrB_Vector_extract.c index 84eaaaacfa..c13388b019 100644 --- a/GraphBLAS/Source/GrB_Vector_extract.c +++ b/GraphBLAS/Source/extract/GrB_Vector_extract.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_extract.h" -#include "GB_get_mask.h" +#include "extract/GB_extract.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_Vector_extract // w = accum (w, u(I)) ( diff --git a/GraphBLAS/Source/Factories/GB_subref_template.c b/GraphBLAS/Source/extract/factory/GB_subref_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_subref_template.c rename to GraphBLAS/Source/extract/factory/GB_subref_template.c diff --git a/GraphBLAS/Source/GB_extractTuples.c b/GraphBLAS/Source/extractTuples/GB_extractTuples.c similarity index 99% rename from GraphBLAS/Source/GB_extractTuples.c rename to GraphBLAS/Source/extractTuples/GB_extractTuples.c index c87213badf..78ba80fa65 100644 --- a/GraphBLAS/Source/GB_extractTuples.c +++ b/GraphBLAS/Source/extractTuples/GB_extractTuples.c @@ -21,6 +21,7 @@ // If A is iso and X is not NULL, the iso scalar Ax [0] is expanded into X. #include "GB.h" +#include "extractTuples/GB_extractTuples.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_extractTuples.h b/GraphBLAS/Source/extractTuples/GB_extractTuples.h similarity index 100% rename from GraphBLAS/Source/GB_extractTuples.h rename to GraphBLAS/Source/extractTuples/GB_extractTuples.h diff --git a/GraphBLAS/Source/GB_extract_vector_list.c b/GraphBLAS/Source/extractTuples/GB_extract_vector_list.c similarity index 98% rename from GraphBLAS/Source/GB_extract_vector_list.c rename to GraphBLAS/Source/extractTuples/GB_extract_vector_list.c index 944f31aad1..b3306767cf 100644 --- a/GraphBLAS/Source/GB_extract_vector_list.c +++ b/GraphBLAS/Source/extractTuples/GB_extract_vector_list.c @@ -13,7 +13,8 @@ // the output J for GB_extractTuples, and I for GB_transpose when the qsort // method is used. -#include "GB_ek_slice.h" +#include "slice/GB_ek_slice.h" +#include "extractTuples/GB_extractTuples.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GrB_Matrix_extractTuples.c b/GraphBLAS/Source/extractTuples/GrB_Matrix_extractTuples.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_extractTuples.c rename to GraphBLAS/Source/extractTuples/GrB_Matrix_extractTuples.c index 45732a8b4b..160d7b5505 100644 --- a/GraphBLAS/Source/GrB_Matrix_extractTuples.c +++ b/GraphBLAS/Source/extractTuples/GrB_Matrix_extractTuples.c @@ -20,6 +20,7 @@ // If A is iso and X is not NULL, the iso scalar Ax [0] is expanded into X. #include "GB.h" +#include "extractTuples/GB_extractTuples.h" #define GB_EXTRACT(prefix,type,T) \ GrB_Info GB_EVAL3 (prefix, _Matrix_extractTuples_, T) /* [I,J,X] = find (A) */\ diff --git a/GraphBLAS/Source/GrB_Vector_extractTuples.c b/GraphBLAS/Source/extractTuples/GrB_Vector_extractTuples.c similarity index 98% rename from GraphBLAS/Source/GrB_Vector_extractTuples.c rename to GraphBLAS/Source/extractTuples/GrB_Vector_extractTuples.c index 86340b544c..31328c50ed 100644 --- a/GraphBLAS/Source/GrB_Vector_extractTuples.c +++ b/GraphBLAS/Source/extractTuples/GrB_Vector_extractTuples.c @@ -20,6 +20,7 @@ // If v is iso and X is not NULL, the iso scalar vx [0] is expanded into X. #include "GB.h" +#include "extractTuples/GB_extractTuples.h" #define GB_EXTRACT(prefix,type,T) \ GrB_Info GB_EVAL3 (prefix, _Vector_extractTuples_, T) \ diff --git a/GraphBLAS/Source/GB_cuda_gateway.h b/GraphBLAS/Source/gateway/GB_cuda_gateway.h similarity index 100% rename from GraphBLAS/Source/GB_cuda_gateway.h rename to GraphBLAS/Source/gateway/GB_cuda_gateway.h diff --git a/GraphBLAS/Source/GB_generic.h b/GraphBLAS/Source/generic/GB_generic.h similarity index 100% rename from GraphBLAS/Source/GB_generic.h rename to GraphBLAS/Source/generic/GB_generic.h diff --git a/GraphBLAS/Source/GB_Descriptor_get.c b/GraphBLAS/Source/get_set/GB_Descriptor_get.c similarity index 100% rename from GraphBLAS/Source/GB_Descriptor_get.c rename to GraphBLAS/Source/get_set/GB_Descriptor_get.c diff --git a/GraphBLAS/Source/GB_Descriptor_get.h b/GraphBLAS/Source/get_set/GB_Descriptor_get.h similarity index 100% rename from GraphBLAS/Source/GB_Descriptor_get.h rename to GraphBLAS/Source/get_set/GB_Descriptor_get.h diff --git a/GraphBLAS/Source/GB_code_name_get.c b/GraphBLAS/Source/get_set/GB_code_name_get.c similarity index 97% rename from GraphBLAS/Source/GB_code_name_get.c rename to GraphBLAS/Source/get_set/GB_code_name_get.c index 1d5c3af53c..106aaaf6f3 100644 --- a/GraphBLAS/Source/GB_code_name_get.c +++ b/GraphBLAS/Source/get_set/GB_code_name_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" const char *GB_code_name_get (GB_Type_code code, char *user_name) { diff --git a/GraphBLAS/Source/GB_get_set.h b/GraphBLAS/Source/get_set/GB_get_set.h similarity index 100% rename from GraphBLAS/Source/GB_get_set.h rename to GraphBLAS/Source/get_set/GB_get_set.h diff --git a/GraphBLAS/Source/GB_matvec_enum_get.c b/GraphBLAS/Source/get_set/GB_matvec_enum_get.c similarity index 97% rename from GraphBLAS/Source/GB_matvec_enum_get.c rename to GraphBLAS/Source/get_set/GB_matvec_enum_get.c index 69156f2ca3..30dda8ed95 100644 --- a/GraphBLAS/Source/GB_matvec_enum_get.c +++ b/GraphBLAS/Source/get_set/GB_matvec_enum_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_matvec_enum_get (GrB_Matrix A, int32_t *value, int field) { diff --git a/GraphBLAS/Source/GB_matvec_name_get.c b/GraphBLAS/Source/get_set/GB_matvec_name_get.c similarity index 97% rename from GraphBLAS/Source/GB_matvec_name_get.c rename to GraphBLAS/Source/get_set/GB_matvec_name_get.c index 43aaae300e..aba111807d 100644 --- a/GraphBLAS/Source/GB_matvec_name_get.c +++ b/GraphBLAS/Source/get_set/GB_matvec_name_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_matvec_name_get (GrB_Matrix A, char *name, int field) { diff --git a/GraphBLAS/Source/GB_matvec_name_set.c b/GraphBLAS/Source/get_set/GB_matvec_name_set.c similarity index 95% rename from GraphBLAS/Source/GB_matvec_name_set.c rename to GraphBLAS/Source/get_set/GB_matvec_name_set.c index f0747f4075..4a89bef29b 100644 --- a/GraphBLAS/Source/GB_matvec_name_set.c +++ b/GraphBLAS/Source/get_set/GB_matvec_name_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_matvec_name_set ( diff --git a/GraphBLAS/Source/GB_matvec_name_size_get.c b/GraphBLAS/Source/get_set/GB_matvec_name_size_get.c similarity index 96% rename from GraphBLAS/Source/GB_matvec_name_size_get.c rename to GraphBLAS/Source/get_set/GB_matvec_name_size_get.c index 85fcd12ff7..e2febc941c 100644 --- a/GraphBLAS/Source/GB_matvec_name_size_get.c +++ b/GraphBLAS/Source/get_set/GB_matvec_name_size_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_matvec_name_size_get (GrB_Matrix A, size_t *value, int field) { diff --git a/GraphBLAS/Source/GB_matvec_set.c b/GraphBLAS/Source/get_set/GB_matvec_set.c similarity index 97% rename from GraphBLAS/Source/GB_matvec_set.c rename to GraphBLAS/Source/get_set/GB_matvec_set.c index 2d6139d82b..024601f840 100644 --- a/GraphBLAS/Source/GB_matvec_set.c +++ b/GraphBLAS/Source/get_set/GB_matvec_set.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" -#include "GB_transpose.h" +#include "get_set/GB_get_set.h" +#include "transpose/GB_transpose.h" #define GB_FREE_ALL ; GrB_Info GB_matvec_set diff --git a/GraphBLAS/Source/GB_monoid_get.c b/GraphBLAS/Source/get_set/GB_monoid_get.c similarity index 98% rename from GraphBLAS/Source/GB_monoid_get.c rename to GraphBLAS/Source/get_set/GB_monoid_get.c index 00fbe8e15f..876fe293e3 100644 --- a/GraphBLAS/Source/GB_monoid_get.c +++ b/GraphBLAS/Source/get_set/GB_monoid_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_monoid_get ( diff --git a/GraphBLAS/Source/GB_monoid_name_get.c b/GraphBLAS/Source/get_set/GB_monoid_name_get.c similarity index 99% rename from GraphBLAS/Source/GB_monoid_name_get.c rename to GraphBLAS/Source/get_set/GB_monoid_name_get.c index 222bab4c6c..7201e4e3bb 100644 --- a/GraphBLAS/Source/GB_monoid_name_get.c +++ b/GraphBLAS/Source/get_set/GB_monoid_name_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" const char *GB_monoid_name_get (GrB_Monoid monoid) { diff --git a/GraphBLAS/Source/GB_op_enum_get.c b/GraphBLAS/Source/get_set/GB_op_enum_get.c similarity index 97% rename from GraphBLAS/Source/GB_op_enum_get.c rename to GraphBLAS/Source/get_set/GB_op_enum_get.c index f2557fec26..978e96832c 100644 --- a/GraphBLAS/Source/GB_op_enum_get.c +++ b/GraphBLAS/Source/get_set/GB_op_enum_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_op_enum_get ( diff --git a/GraphBLAS/Source/GB_op_name_get.c b/GraphBLAS/Source/get_set/GB_op_name_get.c similarity index 99% rename from GraphBLAS/Source/GB_op_name_get.c rename to GraphBLAS/Source/get_set/GB_op_name_get.c index e7a5af1132..3fd79eca29 100644 --- a/GraphBLAS/Source/GB_op_name_get.c +++ b/GraphBLAS/Source/get_set/GB_op_name_get.c @@ -12,7 +12,7 @@ // GB_binop_second, and do not exist outside GraphBLAS. The user application // cannot pass them to GrB_get. -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" const char *GB_op_name_get (GB_Operator op) { diff --git a/GraphBLAS/Source/GB_op_or_type_string_set.c b/GraphBLAS/Source/get_set/GB_op_or_type_string_set.c similarity index 98% rename from GraphBLAS/Source/GB_op_or_type_string_set.c rename to GraphBLAS/Source/get_set/GB_op_or_type_string_set.c index 2e44f32f0a..c06de4664f 100644 --- a/GraphBLAS/Source/GB_op_or_type_string_set.c +++ b/GraphBLAS/Source/get_set/GB_op_or_type_string_set.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" #include -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" GrB_Info GB_op_or_type_string_set ( diff --git a/GraphBLAS/Source/GB_op_scalar_get.c b/GraphBLAS/Source/get_set/GB_op_scalar_get.c similarity index 96% rename from GraphBLAS/Source/GB_op_scalar_get.c rename to GraphBLAS/Source/get_set/GB_op_scalar_get.c index 74b9a8c9c9..02f1d00855 100644 --- a/GraphBLAS/Source/GB_op_scalar_get.c +++ b/GraphBLAS/Source/get_set/GB_op_scalar_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_op_scalar_get ( diff --git a/GraphBLAS/Source/GB_op_size_get.c b/GraphBLAS/Source/get_set/GB_op_size_get.c similarity index 98% rename from GraphBLAS/Source/GB_op_size_get.c rename to GraphBLAS/Source/get_set/GB_op_size_get.c index a560de918d..b9f14c165f 100644 --- a/GraphBLAS/Source/GB_op_size_get.c +++ b/GraphBLAS/Source/get_set/GB_op_size_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_op_size_get ( diff --git a/GraphBLAS/Source/GB_op_string_get.c b/GraphBLAS/Source/get_set/GB_op_string_get.c similarity index 98% rename from GraphBLAS/Source/GB_op_string_get.c rename to GraphBLAS/Source/get_set/GB_op_string_get.c index 6353c8afed..548e196557 100644 --- a/GraphBLAS/Source/GB_op_string_get.c +++ b/GraphBLAS/Source/get_set/GB_op_string_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_op_string_get ( diff --git a/GraphBLAS/Source/GB_op_string_set.c b/GraphBLAS/Source/get_set/GB_op_string_set.c similarity index 97% rename from GraphBLAS/Source/GB_op_string_set.c rename to GraphBLAS/Source/get_set/GB_op_string_set.c index 6f49a5fbc5..a15c875a0b 100644 --- a/GraphBLAS/Source/GB_op_string_set.c +++ b/GraphBLAS/Source/get_set/GB_op_string_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_op_string_set ( diff --git a/GraphBLAS/Source/GB_semiring_name_get.c b/GraphBLAS/Source/get_set/GB_semiring_name_get.c similarity index 99% rename from GraphBLAS/Source/GB_semiring_name_get.c rename to GraphBLAS/Source/get_set/GB_semiring_name_get.c index 54a6d24843..d816baf228 100644 --- a/GraphBLAS/Source/GB_semiring_name_get.c +++ b/GraphBLAS/Source/get_set/GB_semiring_name_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" const char *GB_semiring_name_get (GrB_Semiring semiring) { diff --git a/GraphBLAS/Source/GB_type_code_get.c b/GraphBLAS/Source/get_set/GB_type_code_get.c similarity index 97% rename from GraphBLAS/Source/GB_type_code_get.c rename to GraphBLAS/Source/get_set/GB_type_code_get.c index b0c3609555..29386d1a44 100644 --- a/GraphBLAS/Source/GB_type_code_get.c +++ b/GraphBLAS/Source/get_set/GB_type_code_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Type_Code GB_type_code_get // return the GrB_Type_Code for the code ( diff --git a/GraphBLAS/Source/GB_type_name_get.c b/GraphBLAS/Source/get_set/GB_type_name_get.c similarity index 94% rename from GraphBLAS/Source/GB_type_name_get.c rename to GraphBLAS/Source/get_set/GB_type_name_get.c index 5ab8f2d278..7d70f29e77 100644 --- a/GraphBLAS/Source/GB_type_name_get.c +++ b/GraphBLAS/Source/get_set/GB_type_name_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" const char *GB_type_name_get (GrB_Type type) { diff --git a/GraphBLAS/Source/GB_user_name_set.c b/GraphBLAS/Source/get_set/GB_user_name_set.c similarity index 98% rename from GraphBLAS/Source/GB_user_name_set.c rename to GraphBLAS/Source/get_set/GB_user_name_set.c index 7b9bed82be..5626178303 100644 --- a/GraphBLAS/Source/GB_user_name_set.c +++ b/GraphBLAS/Source/get_set/GB_user_name_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" GrB_Info GB_user_name_set ( diff --git a/GraphBLAS/Source/GrB_BinaryOp_get.c b/GraphBLAS/Source/get_set/GrB_BinaryOp_get.c similarity index 99% rename from GraphBLAS/Source/GrB_BinaryOp_get.c rename to GraphBLAS/Source/get_set/GrB_BinaryOp_get.c index 39e0ba7ed0..7dc791946d 100644 --- a/GraphBLAS/Source/GrB_BinaryOp_get.c +++ b/GraphBLAS/Source/get_set/GrB_BinaryOp_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_BinaryOp_get_Scalar diff --git a/GraphBLAS/Source/GrB_BinaryOp_set.c b/GraphBLAS/Source/get_set/GrB_BinaryOp_set.c similarity index 98% rename from GraphBLAS/Source/GrB_BinaryOp_set.c rename to GraphBLAS/Source/get_set/GrB_BinaryOp_set.c index 9a72236c4d..cf0d7efed0 100644 --- a/GraphBLAS/Source/GrB_BinaryOp_set.c +++ b/GraphBLAS/Source/get_set/GrB_BinaryOp_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_BinaryOp_set_Scalar diff --git a/GraphBLAS/Source/GrB_Descriptor_get2.c b/GraphBLAS/Source/get_set/GrB_Descriptor_get2.c similarity index 99% rename from GraphBLAS/Source/GrB_Descriptor_get2.c rename to GraphBLAS/Source/get_set/GrB_Descriptor_get2.c index 8f9340af52..ac239e0632 100644 --- a/GraphBLAS/Source/GrB_Descriptor_get2.c +++ b/GraphBLAS/Source/get_set/GrB_Descriptor_get2.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Descriptor_set.c b/GraphBLAS/Source/get_set/GrB_Descriptor_set.c similarity index 100% rename from GraphBLAS/Source/GrB_Descriptor_set.c rename to GraphBLAS/Source/get_set/GrB_Descriptor_set.c diff --git a/GraphBLAS/Source/GrB_Descriptor_set2.c b/GraphBLAS/Source/get_set/GrB_Descriptor_set2.c similarity index 99% rename from GraphBLAS/Source/GrB_Descriptor_set2.c rename to GraphBLAS/Source/get_set/GrB_Descriptor_set2.c index 0fa1a4b5f3..e84de0d280 100644 --- a/GraphBLAS/Source/GrB_Descriptor_set2.c +++ b/GraphBLAS/Source/get_set/GrB_Descriptor_set2.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GB_desc_set diff --git a/GraphBLAS/Source/GrB_Global_get.c b/GraphBLAS/Source/get_set/GrB_Global_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Global_get.c rename to GraphBLAS/Source/get_set/GrB_Global_get.c index 95dce502fa..75ac49d15c 100644 --- a/GraphBLAS/Source/GrB_Global_get.c +++ b/GraphBLAS/Source/get_set/GrB_Global_get.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" -#include "GB_jitifyer.h" +#include "get_set/GB_get_set.h" +#include "jitifyer/GB_jitifyer.h" //------------------------------------------------------------------------------ // GrB_Global: an object defining the global state diff --git a/GraphBLAS/Source/GrB_Global_set.c b/GraphBLAS/Source/get_set/GrB_Global_set.c similarity index 99% rename from GraphBLAS/Source/GrB_Global_set.c rename to GraphBLAS/Source/get_set/GrB_Global_set.c index 80c659333a..21c3806db0 100644 --- a/GraphBLAS/Source/GrB_Global_set.c +++ b/GraphBLAS/Source/get_set/GrB_Global_set.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" -#include "GB_jitifyer.h" +#include "get_set/GB_get_set.h" +#include "jitifyer/GB_jitifyer.h" //------------------------------------------------------------------------------ // GB_global_enum_set: get an enum value from the global state diff --git a/GraphBLAS/Source/GrB_IndexUnaryOp_get.c b/GraphBLAS/Source/get_set/GrB_IndexUnaryOp_get.c similarity index 99% rename from GraphBLAS/Source/GrB_IndexUnaryOp_get.c rename to GraphBLAS/Source/get_set/GrB_IndexUnaryOp_get.c index d1708eaccc..b36db229b7 100644 --- a/GraphBLAS/Source/GrB_IndexUnaryOp_get.c +++ b/GraphBLAS/Source/get_set/GrB_IndexUnaryOp_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_IndexUnaryOp_get_Scalar diff --git a/GraphBLAS/Source/GrB_IndexUnaryOp_set.c b/GraphBLAS/Source/get_set/GrB_IndexUnaryOp_set.c similarity index 98% rename from GraphBLAS/Source/GrB_IndexUnaryOp_set.c rename to GraphBLAS/Source/get_set/GrB_IndexUnaryOp_set.c index 7a4ed5824a..2759b206de 100644 --- a/GraphBLAS/Source/GrB_IndexUnaryOp_set.c +++ b/GraphBLAS/Source/get_set/GrB_IndexUnaryOp_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_IndexUnaryOp_set_Scalar diff --git a/GraphBLAS/Source/GrB_Matrix_get.c b/GraphBLAS/Source/get_set/GrB_Matrix_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_get.c rename to GraphBLAS/Source/get_set/GrB_Matrix_get.c index d2b12ed58b..15bb6484cb 100644 --- a/GraphBLAS/Source/GrB_Matrix_get.c +++ b/GraphBLAS/Source/get_set/GrB_Matrix_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Matrix_get_Scalar diff --git a/GraphBLAS/Source/GrB_Matrix_set.c b/GraphBLAS/Source/get_set/GrB_Matrix_set.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_set.c rename to GraphBLAS/Source/get_set/GrB_Matrix_set.c index 365907e651..2fa8c28631 100644 --- a/GraphBLAS/Source/GrB_Matrix_set.c +++ b/GraphBLAS/Source/get_set/GrB_Matrix_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Matrix_set_Scalar diff --git a/GraphBLAS/Source/GrB_Monoid_get.c b/GraphBLAS/Source/get_set/GrB_Monoid_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Monoid_get.c rename to GraphBLAS/Source/get_set/GrB_Monoid_get.c index 823ff5aab8..a3b40adba1 100644 --- a/GraphBLAS/Source/GrB_Monoid_get.c +++ b/GraphBLAS/Source/get_set/GrB_Monoid_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Monoid_get_Scalar diff --git a/GraphBLAS/Source/GrB_Monoid_set.c b/GraphBLAS/Source/get_set/GrB_Monoid_set.c similarity index 98% rename from GraphBLAS/Source/GrB_Monoid_set.c rename to GraphBLAS/Source/get_set/GrB_Monoid_set.c index fc1fcc7958..bf2adcbf23 100644 --- a/GraphBLAS/Source/GrB_Monoid_set.c +++ b/GraphBLAS/Source/get_set/GrB_Monoid_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Monoid_set_Scalar diff --git a/GraphBLAS/Source/GrB_Scalar_get.c b/GraphBLAS/Source/get_set/GrB_Scalar_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Scalar_get.c rename to GraphBLAS/Source/get_set/GrB_Scalar_get.c index 0e88c2ffbe..37dff04bbd 100644 --- a/GraphBLAS/Source/GrB_Scalar_get.c +++ b/GraphBLAS/Source/get_set/GrB_Scalar_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Scalar_get_Scalar diff --git a/GraphBLAS/Source/GrB_Scalar_set.c b/GraphBLAS/Source/get_set/GrB_Scalar_set.c similarity index 98% rename from GraphBLAS/Source/GrB_Scalar_set.c rename to GraphBLAS/Source/get_set/GrB_Scalar_set.c index ff7f002084..0ca6231600 100644 --- a/GraphBLAS/Source/GrB_Scalar_set.c +++ b/GraphBLAS/Source/get_set/GrB_Scalar_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Scalar_set_Scalar diff --git a/GraphBLAS/Source/GrB_Semiring_get.c b/GraphBLAS/Source/get_set/GrB_Semiring_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Semiring_get.c rename to GraphBLAS/Source/get_set/GrB_Semiring_get.c index 257137b2a0..8717d1602f 100644 --- a/GraphBLAS/Source/GrB_Semiring_get.c +++ b/GraphBLAS/Source/get_set/GrB_Semiring_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Semiring_get_Scalar diff --git a/GraphBLAS/Source/GrB_Semiring_set.c b/GraphBLAS/Source/get_set/GrB_Semiring_set.c similarity index 98% rename from GraphBLAS/Source/GrB_Semiring_set.c rename to GraphBLAS/Source/get_set/GrB_Semiring_set.c index e398567ea7..5c87c85a5e 100644 --- a/GraphBLAS/Source/GrB_Semiring_set.c +++ b/GraphBLAS/Source/get_set/GrB_Semiring_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Semiring_set_Scalar diff --git a/GraphBLAS/Source/GrB_Type_get.c b/GraphBLAS/Source/get_set/GrB_Type_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Type_get.c rename to GraphBLAS/Source/get_set/GrB_Type_get.c index 1b2bad06e7..5c9ef4eb5c 100644 --- a/GraphBLAS/Source/GrB_Type_get.c +++ b/GraphBLAS/Source/get_set/GrB_Type_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Type_get_Scalar diff --git a/GraphBLAS/Source/GrB_Type_set.c b/GraphBLAS/Source/get_set/GrB_Type_set.c similarity index 98% rename from GraphBLAS/Source/GrB_Type_set.c rename to GraphBLAS/Source/get_set/GrB_Type_set.c index 3fa6b4b95f..bef8fc659c 100644 --- a/GraphBLAS/Source/GrB_Type_set.c +++ b/GraphBLAS/Source/get_set/GrB_Type_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Type_set_Scalar diff --git a/GraphBLAS/Source/GrB_UnaryOp_get.c b/GraphBLAS/Source/get_set/GrB_UnaryOp_get.c similarity index 99% rename from GraphBLAS/Source/GrB_UnaryOp_get.c rename to GraphBLAS/Source/get_set/GrB_UnaryOp_get.c index 1a88de4c5b..3aca01c81e 100644 --- a/GraphBLAS/Source/GrB_UnaryOp_get.c +++ b/GraphBLAS/Source/get_set/GrB_UnaryOp_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_UnaryOp_get_Scalar diff --git a/GraphBLAS/Source/GrB_UnaryOp_set.c b/GraphBLAS/Source/get_set/GrB_UnaryOp_set.c similarity index 98% rename from GraphBLAS/Source/GrB_UnaryOp_set.c rename to GraphBLAS/Source/get_set/GrB_UnaryOp_set.c index bf92f6d71a..08f35bc370 100644 --- a/GraphBLAS/Source/GrB_UnaryOp_set.c +++ b/GraphBLAS/Source/get_set/GrB_UnaryOp_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_UnaryOp_set_Scalar diff --git a/GraphBLAS/Source/GrB_Vector_get.c b/GraphBLAS/Source/get_set/GrB_Vector_get.c similarity index 99% rename from GraphBLAS/Source/GrB_Vector_get.c rename to GraphBLAS/Source/get_set/GrB_Vector_get.c index 8eb0aef5df..8c4d2281fe 100644 --- a/GraphBLAS/Source/GrB_Vector_get.c +++ b/GraphBLAS/Source/get_set/GrB_Vector_get.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Vector_get_Scalar diff --git a/GraphBLAS/Source/GrB_Vector_set.c b/GraphBLAS/Source/get_set/GrB_Vector_set.c similarity index 99% rename from GraphBLAS/Source/GrB_Vector_set.c rename to GraphBLAS/Source/get_set/GrB_Vector_set.c index aae8adb393..9d8a4109f2 100644 --- a/GraphBLAS/Source/GrB_Vector_set.c +++ b/GraphBLAS/Source/get_set/GrB_Vector_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GrB_Vector_set_Scalar diff --git a/GraphBLAS/Source/GxB_Context_get.c b/GraphBLAS/Source/get_set/GxB_Context_get.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_get.c rename to GraphBLAS/Source/get_set/GxB_Context_get.c diff --git a/GraphBLAS/Source/GxB_Context_get2.c b/GraphBLAS/Source/get_set/GxB_Context_get2.c similarity index 99% rename from GraphBLAS/Source/GxB_Context_get2.c rename to GraphBLAS/Source/get_set/GxB_Context_get2.c index 7a8a5a5ea4..aca4701468 100644 --- a/GraphBLAS/Source/GxB_Context_get2.c +++ b/GraphBLAS/Source/get_set/GxB_Context_get2.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GxB_Context_get_Scalar diff --git a/GraphBLAS/Source/GxB_Context_set.c b/GraphBLAS/Source/get_set/GxB_Context_set.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_set.c rename to GraphBLAS/Source/get_set/GxB_Context_set.c diff --git a/GraphBLAS/Source/GxB_Context_set2.c b/GraphBLAS/Source/get_set/GxB_Context_set2.c similarity index 99% rename from GraphBLAS/Source/GxB_Context_set2.c rename to GraphBLAS/Source/get_set/GxB_Context_set2.c index dd5dabea2c..3eff66b0b9 100644 --- a/GraphBLAS/Source/GxB_Context_set2.c +++ b/GraphBLAS/Source/get_set/GxB_Context_set2.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" +#include "get_set/GB_get_set.h" //------------------------------------------------------------------------------ // GxB_Context_set_Scalar diff --git a/GraphBLAS/Source/GxB_Desc_get.c b/GraphBLAS/Source/get_set/GxB_Desc_get.c similarity index 100% rename from GraphBLAS/Source/GxB_Desc_get.c rename to GraphBLAS/Source/get_set/GxB_Desc_get.c diff --git a/GraphBLAS/Source/GxB_Desc_set.c b/GraphBLAS/Source/get_set/GxB_Desc_set.c similarity index 100% rename from GraphBLAS/Source/GxB_Desc_set.c rename to GraphBLAS/Source/get_set/GxB_Desc_set.c diff --git a/GraphBLAS/Source/GxB_Descriptor_get.c b/GraphBLAS/Source/get_set/GxB_Descriptor_get.c similarity index 100% rename from GraphBLAS/Source/GxB_Descriptor_get.c rename to GraphBLAS/Source/get_set/GxB_Descriptor_get.c diff --git a/GraphBLAS/Source/GxB_Global_Option_get.c b/GraphBLAS/Source/get_set/GxB_Global_Option_get.c similarity index 99% rename from GraphBLAS/Source/GxB_Global_Option_get.c rename to GraphBLAS/Source/get_set/GxB_Global_Option_get.c index 226a315fb7..08e44cb813 100644 --- a/GraphBLAS/Source/GxB_Global_Option_get.c +++ b/GraphBLAS/Source/get_set/GxB_Global_Option_get.c @@ -18,7 +18,7 @@ // GxB_Global_Option_get_FUNCTION function pointers (as void **) #include "GB.h" -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" //------------------------------------------------------------------------------ // GxB_Global_Option_get_INT32: get global options (int32_t scalars or arrays) diff --git a/GraphBLAS/Source/GxB_Global_Option_set.c b/GraphBLAS/Source/get_set/GxB_Global_Option_set.c similarity index 99% rename from GraphBLAS/Source/GxB_Global_Option_set.c rename to GraphBLAS/Source/get_set/GxB_Global_Option_set.c index 05905ddfc2..a9be33b81f 100644 --- a/GraphBLAS/Source/GxB_Global_Option_set.c +++ b/GraphBLAS/Source/get_set/GxB_Global_Option_set.c @@ -19,7 +19,7 @@ // GxB_Global_Option_set_FUNCTION function pointers (as void *) #include "GB.h" -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" //------------------------------------------------------------------------------ // GxB_Global_Option_set_INT32: set a global option (int32_t) diff --git a/GraphBLAS/Source/GxB_Matrix_Option_get.c b/GraphBLAS/Source/get_set/GxB_Matrix_Option_get.c similarity index 100% rename from GraphBLAS/Source/GxB_Matrix_Option_get.c rename to GraphBLAS/Source/get_set/GxB_Matrix_Option_get.c diff --git a/GraphBLAS/Source/GxB_Matrix_Option_set.c b/GraphBLAS/Source/get_set/GxB_Matrix_Option_set.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_Option_set.c rename to GraphBLAS/Source/get_set/GxB_Matrix_Option_set.c index 8f3cc66ef2..230c541058 100644 --- a/GraphBLAS/Source/GxB_Matrix_Option_set.c +++ b/GraphBLAS/Source/get_set/GxB_Matrix_Option_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Serialized_get.c b/GraphBLAS/Source/get_set/GxB_Serialized_get.c similarity index 99% rename from GraphBLAS/Source/GxB_Serialized_get.c rename to GraphBLAS/Source/get_set/GxB_Serialized_get.c index 5d5a22a7da..31a2320788 100644 --- a/GraphBLAS/Source/GxB_Serialized_get.c +++ b/GraphBLAS/Source/get_set/GxB_Serialized_get.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_get_set.h" -#include "GB_serialize.h" +#include "get_set/GB_get_set.h" +#include "serialize/GB_serialize.h" //------------------------------------------------------------------------------ // GB_blob_header_get: get all properties of the blob diff --git a/GraphBLAS/Source/GxB_Vector_Option_get.c b/GraphBLAS/Source/get_set/GxB_Vector_Option_get.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_Option_get.c rename to GraphBLAS/Source/get_set/GxB_Vector_Option_get.c diff --git a/GraphBLAS/Source/GxB_Vector_Option_set.c b/GraphBLAS/Source/get_set/GxB_Vector_Option_set.c similarity index 99% rename from GraphBLAS/Source/GxB_Vector_Option_set.c rename to GraphBLAS/Source/get_set/GxB_Vector_Option_set.c index 3fdd2185c8..e8f4b47ae0 100644 --- a/GraphBLAS/Source/GxB_Vector_Option_set.c +++ b/GraphBLAS/Source/get_set/GxB_Vector_Option_set.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GB_Global.c b/GraphBLAS/Source/global/GB_Global.c similarity index 99% rename from GraphBLAS/Source/GB_Global.c rename to GraphBLAS/Source/global/GB_Global.c index 1eb2750a78..f0b53e9962 100644 --- a/GraphBLAS/Source/GB_Global.c +++ b/GraphBLAS/Source/global/GB_Global.c @@ -14,7 +14,7 @@ // global matrix options, and other settings. #include "GB.h" -#include "GB_cpu_features.h" +#include "cpu/GB_cpu_features.h" //------------------------------------------------------------------------------ // Global storage: for all threads in a user application that uses GraphBLAS diff --git a/GraphBLAS/Source/GB_Global.h b/GraphBLAS/Source/global/GB_Global.h similarity index 100% rename from GraphBLAS/Source/GB_Global.h rename to GraphBLAS/Source/global/GB_Global.h diff --git a/GraphBLAS/Source/GB_factory.h b/GraphBLAS/Source/helper/GB_factory.h similarity index 100% rename from GraphBLAS/Source/GB_factory.h rename to GraphBLAS/Source/helper/GB_factory.h diff --git a/GraphBLAS/Source/GB_helper.c b/GraphBLAS/Source/helper/GB_helper.c similarity index 99% rename from GraphBLAS/Source/GB_helper.c rename to GraphBLAS/Source/helper/GB_helper.c index 3d632848e3..776891416a 100644 --- a/GraphBLAS/Source/GB_helper.c +++ b/GraphBLAS/Source/helper/GB_helper.c @@ -12,7 +12,7 @@ // These functions are only used by the @GrB interface for // SuiteSparse:GraphBLAS. -#include "GB_helper.h" +#include "helper/GB_helper.h" bool GB_factory_kernels_enabled = true ; diff --git a/GraphBLAS/Source/GB_helper.h b/GraphBLAS/Source/helper/GB_helper.h similarity index 99% rename from GraphBLAS/Source/GB_helper.h rename to GraphBLAS/Source/helper/GB_helper.h index 5cb05a5c27..9e59c4865b 100644 --- a/GraphBLAS/Source/GB_helper.h +++ b/GraphBLAS/Source/helper/GB_helper.h @@ -14,7 +14,7 @@ #define GB_HELPER_H #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" double GB_helper0 (void) ; diff --git a/GraphBLAS/Source/GB_hyper.h b/GraphBLAS/Source/hyper/GB_hyper.h similarity index 96% rename from GraphBLAS/Source/GB_hyper.h rename to GraphBLAS/Source/hyper/GB_hyper.h index 884c33e09b..7db13c0b49 100644 --- a/GraphBLAS/Source/GB_hyper.h +++ b/GraphBLAS/Source/hyper/GB_hyper.h @@ -22,12 +22,6 @@ GrB_Info GB_hyper_realloc GB_Werk Werk ) ; -GrB_Info GB_conform_hyper // conform a matrix to sparse/hypersparse -( - GrB_Matrix A, // matrix to conform - GB_Werk Werk -) ; - GrB_Info GB_hyper_prune ( // output, not allocated on input: diff --git a/GraphBLAS/Source/GB_hyper_hash_need.c b/GraphBLAS/Source/hyper/GB_hyper_hash_need.c similarity index 100% rename from GraphBLAS/Source/GB_hyper_hash_need.c rename to GraphBLAS/Source/hyper/GB_hyper_hash_need.c diff --git a/GraphBLAS/Source/GB_hyper_prune.c b/GraphBLAS/Source/hyper/GB_hyper_prune.c similarity index 100% rename from GraphBLAS/Source/GB_hyper_prune.c rename to GraphBLAS/Source/hyper/GB_hyper_prune.c diff --git a/GraphBLAS/Source/GB_hyper_realloc.c b/GraphBLAS/Source/hyper/GB_hyper_realloc.c similarity index 98% rename from GraphBLAS/Source/GB_hyper_realloc.c rename to GraphBLAS/Source/hyper/GB_hyper_realloc.c index 62a35a018e..78ac0320d5 100644 --- a/GraphBLAS/Source/GB_hyper_realloc.c +++ b/GraphBLAS/Source/hyper/GB_hyper_realloc.c @@ -12,7 +12,7 @@ // No change is made to A->Y. #include "GB.h" -#include "GB_unused.h" +#include "include/GB_unused.h" GrB_Info GB_hyper_realloc ( diff --git a/GraphBLAS/Source/GB_hyper_shallow.c b/GraphBLAS/Source/hyper/GB_hyper_shallow.c similarity index 98% rename from GraphBLAS/Source/GB_hyper_shallow.c rename to GraphBLAS/Source/hyper/GB_hyper_shallow.c index f12a51736f..16107d13c6 100644 --- a/GraphBLAS/Source/GB_hyper_shallow.c +++ b/GraphBLAS/Source/hyper/GB_hyper_shallow.c @@ -13,7 +13,7 @@ // is iso then so is C. #include "GB.h" -#include "GB_convert.h" +#include "convert/GB_convert.h" GrB_Matrix GB_hyper_shallow // return C ( diff --git a/GraphBLAS/Source/GB_hypermatrix_prune.c b/GraphBLAS/Source/hyper/GB_hypermatrix_prune.c similarity index 100% rename from GraphBLAS/Source/GB_hypermatrix_prune.c rename to GraphBLAS/Source/hyper/GB_hypermatrix_prune.c diff --git a/GraphBLAS/Source/GB_nvec_nonempty.c b/GraphBLAS/Source/hyper/GB_nvec_nonempty.c similarity index 100% rename from GraphBLAS/Source/GB_nvec_nonempty.c rename to GraphBLAS/Source/hyper/GB_nvec_nonempty.c diff --git a/GraphBLAS/Source/Shared/GB_hyper_hash_lookup.h b/GraphBLAS/Source/hyper/include/GB_hyper_hash_lookup.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_hyper_hash_lookup.h rename to GraphBLAS/Source/hyper/include/GB_hyper_hash_lookup.h diff --git a/GraphBLAS/Source/GB_ij.h b/GraphBLAS/Source/ij/GB_ij.h similarity index 99% rename from GraphBLAS/Source/GB_ij.h rename to GraphBLAS/Source/ij/GB_ij.h index 704cb759e9..5f8b81df73 100644 --- a/GraphBLAS/Source/GB_ij.h +++ b/GraphBLAS/Source/ij/GB_ij.h @@ -119,7 +119,7 @@ static inline bool GB_ij_is_in_list // determine if i is in the list I int64_t inc = Icolon [GxB_INC] ; int64_t e = Icolon [GxB_END] ; if (inc == 0) - { + { // lo:stride:hi with stride of zero. // I is empty if inc is zero, so i is not in I. return (false) ; diff --git a/GraphBLAS/Source/GB_ijlength.c b/GraphBLAS/Source/ij/GB_ijlength.c similarity index 99% rename from GraphBLAS/Source/GB_ijlength.c rename to GraphBLAS/Source/ij/GB_ijlength.c index c96e0e643a..b56ad01b4a 100644 --- a/GraphBLAS/Source/GB_ijlength.c +++ b/GraphBLAS/Source/ij/GB_ijlength.c @@ -10,7 +10,7 @@ // Determine the length of I, and process the colon notation I = begin:inc:end. // No error checking is done. -#include "GB_ij.h" +#include "ij/GB_ij.h" // ensure an unsigned integer does not cause signed integer overflow #define GB_LIMIT(u) (int64_t) (GB_IMIN (u, INT64_MAX)) diff --git a/GraphBLAS/Source/GB_ijproperties.c b/GraphBLAS/Source/ij/GB_ijproperties.c similarity index 99% rename from GraphBLAS/Source/GB_ijproperties.c rename to GraphBLAS/Source/ij/GB_ijproperties.c index ee6eafe774..6cffe282b7 100644 --- a/GraphBLAS/Source/GB_ijproperties.c +++ b/GraphBLAS/Source/ij/GB_ijproperties.c @@ -11,7 +11,7 @@ // check a list of indices I and determine its properties -#include "GB_ij.h" +#include "ij/GB_ij.h" // FUTURE:: if limit=0, print a different message. see also setEl, extractEl. #define GB_ICHECK(i,limit) \ diff --git a/GraphBLAS/Source/GB_ijsort.c b/GraphBLAS/Source/ij/GB_ijsort.c similarity index 99% rename from GraphBLAS/Source/GB_ijsort.c rename to GraphBLAS/Source/ij/GB_ijsort.c index 29ed4564c2..d64cc9f9ee 100644 --- a/GraphBLAS/Source/GB_ijsort.c +++ b/GraphBLAS/Source/ij/GB_ijsort.c @@ -18,8 +18,8 @@ I2k = I1k (~Iduplicate) ; */ -#include "GB_ij.h" -#include "GB_sort.h" +#include "ij/GB_ij.h" +#include "sort/GB_sort.h" #define GB_FREE_WORKSPACE \ { \ diff --git a/GraphBLAS/Source/GB_export.c b/GraphBLAS/Source/import_export/GB_export.c similarity index 99% rename from GraphBLAS/Source/GB_export.c rename to GraphBLAS/Source/import_export/GB_export.c index a8950e1f86..5ebe2a8e7f 100644 --- a/GraphBLAS/Source/GB_export.c +++ b/GraphBLAS/Source/import_export/GB_export.c @@ -11,7 +11,7 @@ // matrix is exported in its current sparsity structure and by-row/by-col // format. -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_export.h b/GraphBLAS/Source/import_export/GB_export.h similarity index 99% rename from GraphBLAS/Source/GB_export.h rename to GraphBLAS/Source/import_export/GB_export.h index 3cc4f40401..4c89e3aa80 100644 --- a/GraphBLAS/Source/GB_export.h +++ b/GraphBLAS/Source/import_export/GB_export.h @@ -9,7 +9,7 @@ #ifndef GB_EXPORT_H #define GB_EXPORT_H -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" GrB_Info GB_import // import/pack a matrix in any format diff --git a/GraphBLAS/Source/GB_import.c b/GraphBLAS/Source/import_export/GB_import.c similarity index 99% rename from GraphBLAS/Source/GB_import.c rename to GraphBLAS/Source/import_export/GB_import.c index 5658ea7ebc..6f86ff5139 100644 --- a/GraphBLAS/Source/GB_import.c +++ b/GraphBLAS/Source/import_export/GB_import.c @@ -10,7 +10,7 @@ // This method takes O(1) time and memory, unless secure is true (used // when the input data is not trusted). -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL GB_Matrix_free (A) ; diff --git a/GraphBLAS/Source/GrB_Matrix_export.c b/GraphBLAS/Source/import_export/GrB_Matrix_export.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_export.c rename to GraphBLAS/Source/import_export/GrB_Matrix_export.c index 9dcb2afe2b..f65ae3242f 100644 --- a/GraphBLAS/Source/GrB_Matrix_export.c +++ b/GraphBLAS/Source/import_export/GrB_Matrix_export.c @@ -28,7 +28,8 @@ GB_Matrix_free (&T) ; \ } -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" +#include "extractTuples/GB_extractTuples.h" //------------------------------------------------------------------------------ // GB_export_worker: export a matrix of any type diff --git a/GraphBLAS/Source/GrB_Matrix_exportHint.c b/GraphBLAS/Source/import_export/GrB_Matrix_exportHint.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_exportHint.c rename to GraphBLAS/Source/import_export/GrB_Matrix_exportHint.c index 33eff6b32f..a3ddab6273 100644 --- a/GraphBLAS/Source/GrB_Matrix_exportHint.c +++ b/GraphBLAS/Source/import_export/GrB_Matrix_exportHint.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" #define GB_FREE_ALL ; GrB_Info GrB_Matrix_exportHint // suggest the best export format diff --git a/GraphBLAS/Source/GrB_Matrix_exportSize.c b/GraphBLAS/Source/import_export/GrB_Matrix_exportSize.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_exportSize.c rename to GraphBLAS/Source/import_export/GrB_Matrix_exportSize.c index 9e3a440db7..49731b21dc 100644 --- a/GraphBLAS/Source/GrB_Matrix_exportSize.c +++ b/GraphBLAS/Source/import_export/GrB_Matrix_exportSize.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" #define GB_FREE_ALL ; GrB_Info GrB_Matrix_exportSize // determine sizes of user arrays for export diff --git a/GraphBLAS/Source/GrB_Matrix_import.c b/GraphBLAS/Source/import_export/GrB_Matrix_import.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_import.c rename to GraphBLAS/Source/import_export/GrB_Matrix_import.c index 2996b659ce..5d3b331269 100644 --- a/GraphBLAS/Source/GrB_Matrix_import.c +++ b/GraphBLAS/Source/import_export/GrB_Matrix_import.c @@ -10,8 +10,8 @@ // No typecasting is done. The type of entries in the Ax array must match // the GrB_Type type parameter. -#include "GB_export.h" -#include "GB_build.h" +#include "import_export/GB_export.h" +#include "builder/GB_build.h" #define GB_FREE_ALL \ { \ @@ -307,7 +307,7 @@ static GrB_Info GB_import_worker // import a matrix of any type // determine if A is iso //-------------------------------------------------------------------------- - if (GB_check_if_iso (*A)) + if (GB_all_entries_are_iso (*A)) { // All entries in A are the same; convert A to iso GBURBLE ("(import post iso) ") ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_BitmapC.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_BitmapC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_export_BitmapC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_BitmapC.c index 84be7fcd79..825f987cb1 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_BitmapC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_BitmapC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_BitmapR.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_BitmapR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_export_BitmapR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_BitmapR.c index 425b6ae3b8..acfbbc5e43 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_BitmapR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_BitmapR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_CSC.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_CSC.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_export_CSC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_CSC.c index 2056ff1cb0..53afe49e20 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_CSC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_CSR.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_CSR.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_export_CSR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_CSR.c index 2948a84db1..edb919d0ca 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_CSR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_CSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_FullC.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_FullC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_export_FullC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_FullC.c index 633d174548..43e8443032 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_FullC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_FullC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_FullR.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_FullR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_export_FullR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_FullR.c index b5685bcef1..93579b6aff 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_FullR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_FullR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_HyperCSC.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_HyperCSC.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_export_HyperCSC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_HyperCSC.c index 5228f1376a..bb81925dbc 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_HyperCSC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_HyperCSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_export_HyperCSR.c b/GraphBLAS/Source/import_export/GxB_Matrix_export_HyperCSR.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_export_HyperCSR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_export_HyperCSR.c index d7da8d3ec3..4b0556e826 100644 --- a/GraphBLAS/Source/GxB_Matrix_export_HyperCSR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_export_HyperCSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_import_BitmapC.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_BitmapC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_BitmapC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_BitmapC.c index 16330fc1c7..e2edabd3e0 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_BitmapC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_BitmapC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_BitmapC // import a bitmap matrix, held by column ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_BitmapR.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_BitmapR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_BitmapR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_BitmapR.c index c5098ccced..07c139ba2b 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_BitmapR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_BitmapR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_BitmapR // import a bitmap matrix, held by row ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_CSC.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_CSC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_CSC.c index 32d4877e3b..1e61780ab2 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_CSC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_CSC // import a CSC matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_CSR.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_CSR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_CSR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_CSR.c index 7b6b1e6b82..48ada1482c 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_CSR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_CSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_CSR // import a CSR matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_FullC.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_FullC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_FullC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_FullC.c index 3e47812494..8fb7324123 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_FullC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_FullC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_FullC // import a full matrix, held by column ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_FullR.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_FullR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_FullR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_FullR.c index 91ef3b496e..03ac96b7f3 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_FullR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_FullR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_FullR // import a full matrix, held by row ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_HyperCSC.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_HyperCSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_HyperCSC.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_HyperCSC.c index 9ab99ad60a..18e673d8b7 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_HyperCSC.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_HyperCSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_HyperCSC // import a hypersparse CSC matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_import_HyperCSR.c b/GraphBLAS/Source/import_export/GxB_Matrix_import_HyperCSR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_import_HyperCSR.c rename to GraphBLAS/Source/import_export/GxB_Matrix_import_HyperCSR.c index 5acd633a02..b98626ad35 100644 --- a/GraphBLAS/Source/GxB_Matrix_import_HyperCSR.c +++ b/GraphBLAS/Source/import_export/GxB_Matrix_import_HyperCSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_import_HyperCSR // import a hypersparse CSR matrix ( diff --git a/GraphBLAS/Source/GxB_Vector_export_Bitmap.c b/GraphBLAS/Source/import_export/GxB_Vector_export_Bitmap.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_export_Bitmap.c rename to GraphBLAS/Source/import_export/GxB_Vector_export_Bitmap.c index cb9976912a..9cf21e386c 100644 --- a/GraphBLAS/Source/GxB_Vector_export_Bitmap.c +++ b/GraphBLAS/Source/import_export/GxB_Vector_export_Bitmap.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Vector_export_CSC.c b/GraphBLAS/Source/import_export/GxB_Vector_export_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_export_CSC.c rename to GraphBLAS/Source/import_export/GxB_Vector_export_CSC.c index cf8498fc7a..a005791ae2 100644 --- a/GraphBLAS/Source/GxB_Vector_export_CSC.c +++ b/GraphBLAS/Source/import_export/GxB_Vector_export_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Vector_export_Full.c b/GraphBLAS/Source/import_export/GxB_Vector_export_Full.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_export_Full.c rename to GraphBLAS/Source/import_export/GxB_Vector_export_Full.c index d916e5821b..4e03075f0e 100644 --- a/GraphBLAS/Source/GxB_Vector_export_Full.c +++ b/GraphBLAS/Source/import_export/GxB_Vector_export_Full.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Vector_import_Bitmap.c b/GraphBLAS/Source/import_export/GxB_Vector_import_Bitmap.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_import_Bitmap.c rename to GraphBLAS/Source/import_export/GxB_Vector_import_Bitmap.c index b6de05e71c..35ce480873 100644 --- a/GraphBLAS/Source/GxB_Vector_import_Bitmap.c +++ b/GraphBLAS/Source/import_export/GxB_Vector_import_Bitmap.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Vector_import_Bitmap // import a bitmap vector ( diff --git a/GraphBLAS/Source/GxB_Vector_import_CSC.c b/GraphBLAS/Source/import_export/GxB_Vector_import_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_import_CSC.c rename to GraphBLAS/Source/import_export/GxB_Vector_import_CSC.c index 67b340ed70..fff56672ee 100644 --- a/GraphBLAS/Source/GxB_Vector_import_CSC.c +++ b/GraphBLAS/Source/import_export/GxB_Vector_import_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Vector_import_CSC // import a vector in CSC format ( diff --git a/GraphBLAS/Source/GxB_Vector_import_Full.c b/GraphBLAS/Source/import_export/GxB_Vector_import_Full.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_import_Full.c rename to GraphBLAS/Source/import_export/GxB_Vector_import_Full.c index 0aec58ab3f..7d8a5ebaf4 100644 --- a/GraphBLAS/Source/GxB_Vector_import_Full.c +++ b/GraphBLAS/Source/import_export/GxB_Vector_import_Full.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Vector_import_Full // import a full vector ( diff --git a/GraphBLAS/Source/Template/GB_compiler.h b/GraphBLAS/Source/include/GB_compiler.h similarity index 100% rename from GraphBLAS/Source/Template/GB_compiler.h rename to GraphBLAS/Source/include/GB_compiler.h diff --git a/GraphBLAS/Source/Template/GB_coverage.h b/GraphBLAS/Source/include/GB_coverage.h similarity index 100% rename from GraphBLAS/Source/Template/GB_coverage.h rename to GraphBLAS/Source/include/GB_coverage.h diff --git a/GraphBLAS/Source/Template/GB_defaults.h b/GraphBLAS/Source/include/GB_defaults.h similarity index 100% rename from GraphBLAS/Source/Template/GB_defaults.h rename to GraphBLAS/Source/include/GB_defaults.h diff --git a/GraphBLAS/Source/Template/GB_dev.h b/GraphBLAS/Source/include/GB_dev.h similarity index 100% rename from GraphBLAS/Source/Template/GB_dev.h rename to GraphBLAS/Source/include/GB_dev.h diff --git a/GraphBLAS/Source/include/GB_include.h b/GraphBLAS/Source/include/GB_include.h new file mode 100644 index 0000000000..81c0b3463d --- /dev/null +++ b/GraphBLAS/Source/include/GB_include.h @@ -0,0 +1,139 @@ +//------------------------------------------------------------------------------ +// GB_include.h: internal definitions for GraphBLAS, including JIT kernels +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +//------------------------------------------------------------------------------ + +#ifndef GB_TEMPLATE_H +#define GB_TEMPLATE_H + +//------------------------------------------------------------------------------ +// definitions that modify GraphBLAS.h +//------------------------------------------------------------------------------ + +#include "include/GB_dev.h" +#include "include/GB_compiler.h" +#include "include/GB_warnings.h" +#include "include/GB_coverage.h" + +//------------------------------------------------------------------------------ +// user-visible GraphBLAS.h +//------------------------------------------------------------------------------ + +#include "GraphBLAS.h" +#undef I + +#ifdef GBMATLAB +#undef GRAPHBLAS_HAS_CUDA +#endif + +//------------------------------------------------------------------------------ +// handle the restrict and 'static inline' keywords +//------------------------------------------------------------------------------ + +// Intentionally shadow the built-in "restrict" keyword. See GraphBLAS.h for +// the definition of GB_restrict. It becomes empty for C++, and "__restrict" +// for MS Visual Studio. Otherwise, GB_restrict is just "restrict" on C11 +// compliant compilers. I prefer to use the "restrict" keyword to make the +// code readable. This #define is a patch for compilers that don't support it: + +#define restrict GB_restrict + +// for internal static inline functions (will be redefined for CUDA) +#undef GB_STATIC_INLINE +#define GB_STATIC_INLINE static inline + +//------------------------------------------------------------------------------ +// internal #include files +//------------------------------------------------------------------------------ + +#include "include/GB_prefix.h" +#include "include/GB_defaults.h" + +#ifdef GB_JIT_KERNEL + + //-------------------------------------------------------------------------- + // include files for JIT kernels + //-------------------------------------------------------------------------- + + // Placed in the SuiteSparse/GrB(version)/src/include folder by GrB_init, + // via the JITPackage. These files are used by the CPU JIT kernels (via + // this file) and the CUDA JIT kernels (CUDA/include/GB_cuda_kernel.cuh): + #include "include/GB_pun.h" + #include "include/GB_partition.h" + #include "include/GB_binary_search.h" + #include "include/GB_zombie.h" + #include "include/GB_int64_mult.h" + #include "include/GB_index.h" + #include "include/GB_hash.h" + #include "include/GB_complex.h" + #include "include/GB_iceil.h" + #include "include/GB_math_macros.h" + #include "include/GB_memory_macros.h" + #include "include/GB_printf_kernels.h" + #include "include/GB_opaque.h" + #include "include/GB_werk.h" + #include "include/GB_callback_proto.h" + #include "include/GB_saxpy3task_struct.h" + #include "include/GB_callback.h" + #include "include/GB_hyper_hash_lookup.h" + + // the remaining files are only used in the CPU JIT kernels: + #include "include/GB_bytes.h" + #include "include/GB_atomics.h" + #include "include/GB_assert_kernels.h" + #include "include/GB_nthreads.h" + #include "include/GB_log2.h" + #include "include/GB_task_struct.h" + #include "include/GB_wait_macros.h" + #include "include/GB_AxB_macros.h" + #include "include/GB_ek_slice_kernels.h" + #include "include/GB_bitmap_scatter.h" + #include "include/GB_omp_kernels.h" + +#else + + //-------------------------------------------------------------------------- + // include files for the GraphBLAS libary + //-------------------------------------------------------------------------- + + // Original location in the GraphBLAS/Source folder, for compiling + // the GraphBLAS library, including PreJIT kernels: + #include "type/include/GB_pun.h" + #include "slice/include/GB_partition.h" + #include "math/include/GB_binary_search.h" + #include "math/include/GB_zombie.h" + #include "math/include/GB_int64_mult.h" + #include "assign/include/GB_index.h" + #include "math/include/GB_hash.h" + #include "math/include/GB_complex.h" + #include "math/include/GB_iceil.h" + #include "math/include/GB_math_macros.h" + #include "memory/include/GB_memory_macros.h" + #include "print/include/GB_printf_kernels.h" + #include "builtin/include/GB_opaque.h" + #include "werk/include/GB_werk.h" + #include "callback/include/GB_callback_proto.h" + #include "mxm/include/GB_saxpy3task_struct.h" + #include "callback/include/GB_callback.h" + #include "hyper/include/GB_hyper_hash_lookup.h" + + #include "type/include/GB_bytes.h" + #include "omp/include/GB_atomics.h" + #include "ok/include/GB_assert_kernels.h" + #include "omp/include/GB_nthreads.h" + #include "math/include/GB_log2.h" + #include "slice/include/GB_task_struct.h" + #include "wait/include/GB_wait_macros.h" + #include "mxm/include/GB_AxB_macros.h" + #include "slice/include/GB_ek_slice_kernels.h" + #include "assign/include/GB_bitmap_scatter.h" + #include "omp/include/GB_omp_kernels.h" + +#endif + +#endif + diff --git a/GraphBLAS/Source/Template/GB_prefix.h b/GraphBLAS/Source/include/GB_prefix.h similarity index 100% rename from GraphBLAS/Source/Template/GB_prefix.h rename to GraphBLAS/Source/include/GB_prefix.h diff --git a/GraphBLAS/Source/Shared/GB_unused.h b/GraphBLAS/Source/include/GB_unused.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_unused.h rename to GraphBLAS/Source/include/GB_unused.h diff --git a/GraphBLAS/Source/Template/GB_warnings.h b/GraphBLAS/Source/include/GB_warnings.h similarity index 100% rename from GraphBLAS/Source/Template/GB_warnings.h rename to GraphBLAS/Source/include/GB_warnings.h diff --git a/GraphBLAS/Source/GrB_IndexUnaryOp_free.c b/GraphBLAS/Source/indexunaryop/GrB_IndexUnaryOp_free.c similarity index 100% rename from GraphBLAS/Source/GrB_IndexUnaryOp_free.c rename to GraphBLAS/Source/indexunaryop/GrB_IndexUnaryOp_free.c diff --git a/GraphBLAS/Source/GrB_IndexUnaryOp_new.c b/GraphBLAS/Source/indexunaryop/GrB_IndexUnaryOp_new.c similarity index 100% rename from GraphBLAS/Source/GrB_IndexUnaryOp_new.c rename to GraphBLAS/Source/indexunaryop/GrB_IndexUnaryOp_new.c diff --git a/GraphBLAS/Source/GxB_IndexUnaryOp_new.c b/GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_new.c similarity index 99% rename from GraphBLAS/Source/GxB_IndexUnaryOp_new.c rename to GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_new.c index 17f9d227c3..17d10f6c00 100644 --- a/GraphBLAS/Source/GxB_IndexUnaryOp_new.c +++ b/GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_new.c @@ -18,7 +18,7 @@ // If the function pointer is NULL, the function is compiled with the JIT. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" GrB_Info GxB_IndexUnaryOp_new // create a named user-created IndexUnaryOp ( diff --git a/GraphBLAS/Source/GxB_IndexUnaryOp_xtype_name.c b/GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_xtype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_IndexUnaryOp_xtype_name.c rename to GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_xtype_name.c diff --git a/GraphBLAS/Source/GxB_IndexUnaryOp_ytype_name.c b/GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_ytype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_IndexUnaryOp_ytype_name.c rename to GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_ytype_name.c diff --git a/GraphBLAS/Source/GxB_IndexUnaryOp_ztype_name.c b/GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_ztype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_IndexUnaryOp_ztype_name.c rename to GraphBLAS/Source/indexunaryop/GxB_IndexUnaryOp_ztype_name.c diff --git a/GraphBLAS/Source/GxB_SelectOp_ttype.c b/GraphBLAS/Source/indexunaryop/GxB_SelectOp_ttype.c similarity index 100% rename from GraphBLAS/Source/GxB_SelectOp_ttype.c rename to GraphBLAS/Source/indexunaryop/GxB_SelectOp_ttype.c diff --git a/GraphBLAS/Source/GxB_SelectOp_xtype.c b/GraphBLAS/Source/indexunaryop/GxB_SelectOp_xtype.c similarity index 100% rename from GraphBLAS/Source/GxB_SelectOp_xtype.c rename to GraphBLAS/Source/indexunaryop/GxB_SelectOp_xtype.c diff --git a/GraphBLAS/Source/GB_init.c b/GraphBLAS/Source/init/GB_init.c similarity index 99% rename from GraphBLAS/Source/GB_init.c rename to GraphBLAS/Source/init/GB_init.c index 331fde19c5..62eac4e653 100644 --- a/GraphBLAS/Source/GB_init.c +++ b/GraphBLAS/Source/init/GB_init.c @@ -36,8 +36,8 @@ #define GB_FREE_ALL ; #include "GB.h" -#include "GB_init.h" -#include "GB_stringify.h" +#include "init/GB_init.h" +#include "jitifyer/GB_stringify.h" //------------------------------------------------------------------------------ // GB_init diff --git a/GraphBLAS/Source/GB_init.h b/GraphBLAS/Source/init/GB_init.h similarity index 100% rename from GraphBLAS/Source/GB_init.h rename to GraphBLAS/Source/init/GB_init.h diff --git a/GraphBLAS/Source/GrB_error.c b/GraphBLAS/Source/init/GrB_error.c similarity index 100% rename from GraphBLAS/Source/GrB_error.c rename to GraphBLAS/Source/init/GrB_error.c diff --git a/GraphBLAS/Source/GrB_finalize.c b/GraphBLAS/Source/init/GrB_finalize.c similarity index 95% rename from GraphBLAS/Source/GrB_finalize.c rename to GraphBLAS/Source/init/GrB_finalize.c index e77287c3c8..5690f1181f 100644 --- a/GraphBLAS/Source/GrB_finalize.c +++ b/GraphBLAS/Source/init/GrB_finalize.c @@ -13,7 +13,7 @@ // same time. #include "GB.h" -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" GrB_Info GrB_finalize ( ) { diff --git a/GraphBLAS/Source/GrB_getVersion.c b/GraphBLAS/Source/init/GrB_getVersion.c similarity index 100% rename from GraphBLAS/Source/GrB_getVersion.c rename to GraphBLAS/Source/init/GrB_getVersion.c diff --git a/GraphBLAS/Source/GrB_init.c b/GraphBLAS/Source/init/GrB_init.c similarity index 98% rename from GraphBLAS/Source/GrB_init.c rename to GraphBLAS/Source/init/GrB_init.c index c4fe7d0e51..5deba02cac 100644 --- a/GraphBLAS/Source/GrB_init.c +++ b/GraphBLAS/Source/init/GrB_init.c @@ -15,7 +15,7 @@ // FIXME: rename GxB_*BLOCKING_GPU to GxB_*BLOCKING_CUDA. #include "GB.h" -#include "GB_init.h" +#include "init/GB_init.h" GrB_Info GrB_init // start up GraphBLAS ( diff --git a/GraphBLAS/Source/GxB_init.c b/GraphBLAS/Source/init/GxB_init.c similarity index 99% rename from GraphBLAS/Source/GxB_init.c rename to GraphBLAS/Source/init/GxB_init.c index fb453ccf50..d08a7dafac 100644 --- a/GraphBLAS/Source/GxB_init.c +++ b/GraphBLAS/Source/init/GxB_init.c @@ -49,7 +49,7 @@ // GxB_init (mode, my_malloc, NULL, NULL, my_free) ; #include "GB.h" -#include "GB_init.h" +#include "init/GB_init.h" GrB_Info GxB_init // start up GraphBLAS and also define malloc, etc ( diff --git a/GraphBLAS/Source/GB_check_if_iso.c b/GraphBLAS/Source/iso/GB_all_entries_are_iso.c similarity index 87% rename from GraphBLAS/Source/GB_check_if_iso.c rename to GraphBLAS/Source/iso/GB_all_entries_are_iso.c index e1da0acb65..dda232c2c2 100644 --- a/GraphBLAS/Source/GB_check_if_iso.c +++ b/GraphBLAS/Source/iso/GB_all_entries_are_iso.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_check_if_iso: check if all entries in a matrix are identical +// GB_all_entries_are_iso: check if all entries in a matrix are identical //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -15,9 +15,9 @@ #include "GB.h" -bool GB_check_if_iso // return true if A is iso, false otherwise +bool GB_all_entries_are_iso // return true if A is iso, false otherwise ( - const GrB_Matrix A // matrix to check if iso + const GrB_Matrix A // matrix to test if all entries are the same ) { @@ -49,7 +49,7 @@ bool GB_check_if_iso // return true if A is iso, false otherwise ASSERT (GB_JUMBLED_OK (A)) ; ASSERT (!GB_PENDING (A)) ; ASSERT (!GB_IS_BITMAP (A)) ; - ASSERT_MATRIX_OK (A, "A input for GB_check_if_iso", GB0) ; + ASSERT_MATRIX_OK (A, "A input for GB_all_entries_are_iso", GB0) ; //-------------------------------------------------------------------------- // get A @@ -89,23 +89,23 @@ bool GB_check_if_iso // return true if A is iso, false otherwise { case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_A_TYPE uint8_t - #include "GB_check_if_iso_template.c" + #include "iso/factory/GB_all_entries_are_iso_template.c" break ; case GB_2BYTE : // uint16, int16, or 2-byte user #define GB_A_TYPE uint16_t - #include "GB_check_if_iso_template.c" + #include "iso/factory/GB_all_entries_are_iso_template.c" break ; case GB_4BYTE : // uint32, int32, float, or 4-byte user #define GB_A_TYPE uint32_t - #include "GB_check_if_iso_template.c" + #include "iso/factory/GB_all_entries_are_iso_template.c" break ; case GB_8BYTE : // uint64, int64, double, float complex, // or 8-byte user defined #define GB_A_TYPE uint64_t - #include "GB_check_if_iso_template.c" + #include "iso/factory/GB_all_entries_are_iso_template.c" break ; case GB_16BYTE : // double complex or 16-byte user @@ -118,7 +118,7 @@ bool GB_check_if_iso // return true if A is iso, false otherwise #define GB_COMPARE_WITH_FIRST_VALUE(my_iso, a, Ax, p) \ my_iso = my_iso & (a ## 0 == Ax [2*p ]) \ & (a ## 1 == Ax [2*p+1]) - #include "GB_check_if_iso_template.c" + #include "iso/factory/GB_all_entries_are_iso_template.c" break ; default:; @@ -138,7 +138,7 @@ bool GB_check_if_iso // return true if A is iso, false otherwise #undef GB_COMPARE_WITH_FIRST_VALUE #define GB_COMPARE_WITH_FIRST_VALUE(my_iso, a, Ax, p) \ my_iso = my_iso & (memcmp (a, Ax + (p)*asize, asize) == 0) - #include "GB_check_if_iso_template.c" + #include "iso/factory/GB_all_entries_are_iso_template.c" } return (iso) ; diff --git a/GraphBLAS/Source/GB_expand_iso.c b/GraphBLAS/Source/iso/GB_expand_iso.c similarity index 99% rename from GraphBLAS/Source/GB_expand_iso.c rename to GraphBLAS/Source/iso/GB_expand_iso.c index ccf42b72ae..2d3adbe75c 100644 --- a/GraphBLAS/Source/GB_expand_iso.c +++ b/GraphBLAS/Source/iso/GB_expand_iso.c @@ -10,7 +10,7 @@ // JIT: needed. #include "GB.h" -#include "GB_is_nonzero.h" +#include "iso/GB_is_nonzero.h" void GB_expand_iso // expand an iso scalar into an entire array ( diff --git a/GraphBLAS/Source/GB_is_nonzero.h b/GraphBLAS/Source/iso/GB_is_nonzero.h similarity index 100% rename from GraphBLAS/Source/GB_is_nonzero.h rename to GraphBLAS/Source/iso/GB_is_nonzero.h diff --git a/GraphBLAS/Source/GB_iso.h b/GraphBLAS/Source/iso/GB_iso.h similarity index 93% rename from GraphBLAS/Source/GB_iso.h rename to GraphBLAS/Source/iso/GB_iso.h index 463987070d..c3ed11697d 100644 --- a/GraphBLAS/Source/GB_iso.h +++ b/GraphBLAS/Source/iso/GB_iso.h @@ -61,9 +61,9 @@ void GB_expand_iso // expand an iso scalar into an entire array size_t size // size of the scalar and each entry of X ) ; -bool GB_check_if_iso // return true if A is iso, false otherwise +bool GB_all_entries_are_iso // return true if A is iso, false otherwise ( - const GrB_Matrix A // matrix to reduce + const GrB_Matrix A // matrix to test if all entries are the same ) ; #endif diff --git a/GraphBLAS/Source/GB_unop_code_iso.c b/GraphBLAS/Source/iso/GB_unop_code_iso.c similarity index 100% rename from GraphBLAS/Source/GB_unop_code_iso.c rename to GraphBLAS/Source/iso/GB_unop_code_iso.c diff --git a/GraphBLAS/Source/GB_unop_iso.c b/GraphBLAS/Source/iso/GB_unop_iso.c similarity index 100% rename from GraphBLAS/Source/GB_unop_iso.c rename to GraphBLAS/Source/iso/GB_unop_iso.c diff --git a/GraphBLAS/Source/GxB_Matrix_iso.c b/GraphBLAS/Source/iso/GxB_Matrix_iso.c similarity index 100% rename from GraphBLAS/Source/GxB_Matrix_iso.c rename to GraphBLAS/Source/iso/GxB_Matrix_iso.c diff --git a/GraphBLAS/Source/GxB_Vector_iso.c b/GraphBLAS/Source/iso/GxB_Vector_iso.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_iso.c rename to GraphBLAS/Source/iso/GxB_Vector_iso.c diff --git a/GraphBLAS/Source/Factories/GB_check_if_iso_template.c b/GraphBLAS/Source/iso/factory/GB_all_entries_are_iso_template.c similarity index 95% rename from GraphBLAS/Source/Factories/GB_check_if_iso_template.c rename to GraphBLAS/Source/iso/factory/GB_all_entries_are_iso_template.c index d7a1960132..b88bc4589e 100644 --- a/GraphBLAS/Source/Factories/GB_check_if_iso_template.c +++ b/GraphBLAS/Source/iso/factory/GB_all_entries_are_iso_template.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_check_if_iso_template: check if all entries in a matrix are identical +// GB_all_entries_are_iso_template: check if all entries in a matrix are identical //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. diff --git a/GraphBLAS/Source/GB_Iterator_attach.c b/GraphBLAS/Source/iterator/GB_Iterator_attach.c similarity index 100% rename from GraphBLAS/Source/GB_Iterator_attach.c rename to GraphBLAS/Source/iterator/GB_Iterator_attach.c diff --git a/GraphBLAS/Source/GB_Iterator_rc_bitmap_next.c b/GraphBLAS/Source/iterator/GB_Iterator_rc_bitmap_next.c similarity index 100% rename from GraphBLAS/Source/GB_Iterator_rc_bitmap_next.c rename to GraphBLAS/Source/iterator/GB_Iterator_rc_bitmap_next.c diff --git a/GraphBLAS/Source/GB_Iterator_rc_seek.c b/GraphBLAS/Source/iterator/GB_Iterator_rc_seek.c similarity index 100% rename from GraphBLAS/Source/GB_Iterator_rc_seek.c rename to GraphBLAS/Source/iterator/GB_Iterator_rc_seek.c diff --git a/GraphBLAS/Source/GxB_Iterator_free.c b/GraphBLAS/Source/iterator/GxB_Iterator_free.c similarity index 100% rename from GraphBLAS/Source/GxB_Iterator_free.c rename to GraphBLAS/Source/iterator/GxB_Iterator_free.c diff --git a/GraphBLAS/Source/GxB_Iterator_get.c b/GraphBLAS/Source/iterator/GxB_Iterator_get.c similarity index 100% rename from GraphBLAS/Source/GxB_Iterator_get.c rename to GraphBLAS/Source/iterator/GxB_Iterator_get.c diff --git a/GraphBLAS/Source/GxB_Iterator_new.c b/GraphBLAS/Source/iterator/GxB_Iterator_new.c similarity index 100% rename from GraphBLAS/Source/GxB_Iterator_new.c rename to GraphBLAS/Source/iterator/GxB_Iterator_new.c diff --git a/GraphBLAS/Source/GxB_Matrix_Iterator.c b/GraphBLAS/Source/iterator/GxB_Matrix_Iterator.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_Iterator.c rename to GraphBLAS/Source/iterator/GxB_Matrix_Iterator.c index afa30605db..afeeec51fe 100644 --- a/GraphBLAS/Source/GxB_Matrix_Iterator.c +++ b/GraphBLAS/Source/iterator/GxB_Matrix_Iterator.c @@ -6,7 +6,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "GB.h" -#include "GB_search_for_vector_template.c" +#include "slice/factory/GB_search_for_vector_template.c" //------------------------------------------------------------------------------ // GxB_Matrix_Iterator_attach: attach an entry iterator to a matrix diff --git a/GraphBLAS/Source/GxB_Vector_Iterator.c b/GraphBLAS/Source/iterator/GxB_Vector_Iterator.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_Iterator.c rename to GraphBLAS/Source/iterator/GxB_Vector_Iterator.c diff --git a/GraphBLAS/Source/GxB_colIterator.c b/GraphBLAS/Source/iterator/GxB_colIterator.c similarity index 100% rename from GraphBLAS/Source/GxB_colIterator.c rename to GraphBLAS/Source/iterator/GxB_colIterator.c diff --git a/GraphBLAS/Source/GxB_rowIterator.c b/GraphBLAS/Source/iterator/GxB_rowIterator.c similarity index 100% rename from GraphBLAS/Source/GxB_rowIterator.c rename to GraphBLAS/Source/iterator/GxB_rowIterator.c diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel.h b/GraphBLAS/Source/jit_kernels/include/GB_jit_kernel.h similarity index 91% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel.h rename to GraphBLAS/Source/jit_kernels/include/GB_jit_kernel.h index 46bbddfcf3..2156d6a43d 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel.h +++ b/GraphBLAS/Source/jit_kernels/include/GB_jit_kernel.h @@ -16,14 +16,14 @@ #ifndef GB_CUDA_KERNEL // for CPU JIT kernels: - #include "GB_Template.h" + #include "include/GB_include.h" #else // for CUDA JIT kernels: - #include "GB_cuda_kernel.cuh" + #include "include/GB_cuda_kernel.cuh" #endif // for all JIT kernels -#include "GB_jit_kernel_proto.h" +#include "include/GB_jit_kernel_proto.h" #if defined (_MSC_VER) && !(defined (__INTEL_COMPILER) || defined(__INTEL_CLANG_COMPILER)) #define GB_JIT_GLOBAL extern __declspec ( dllexport ) #else @@ -32,7 +32,7 @@ #ifndef GB_JIT_RUNTIME // for PreJIT kernels (CPU and CUDA) - #include "GB_callbacks.h" + #include "callback/GB_callbacks.h" #endif // these macros are redefined by the JIT kernels to specialize them for each diff --git a/GraphBLAS/Source/Template/GB_jit_kernel_proto.h b/GraphBLAS/Source/jit_kernels/include/GB_jit_kernel_proto.h similarity index 100% rename from GraphBLAS/Source/Template/GB_jit_kernel_proto.h rename to GraphBLAS/Source/jit_kernels/include/GB_jit_kernel_proto.h diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot2.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot2.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot2.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot2.c index b4eb6e8911..d01fffcf6a 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot2.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot2.c @@ -12,7 +12,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT2_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT2_PROTO (GB_jit_kernel) { - #include "GB_AxB_dot2_meta.c" + #include "template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot2n.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot2n.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot2n.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot2n.c index 68a0ada24a..df6f5db20d 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot2n.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot2n.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT2N_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT2N_PROTO (GB_jit_kernel) { #define GB_A_NOT_TRANSPOSED - #include "GB_AxB_dot2_meta.c" + #include "template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot3.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot3.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot3.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot3.c index 2319d49462..2998e6b049 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot3.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot3.c @@ -12,7 +12,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT3_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT3_PROTO (GB_jit_kernel) { - #include "GB_AxB_dot3_meta.c" + #include "template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot4.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot4.c similarity index 95% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot4.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot4.c index ffe72670b7..3c359e790a 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_dot4.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_dot4.c @@ -18,7 +18,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_DOT4_PROTO (GB_jit_kernel) GB_malloc_memory_f GB_malloc_memory = my_callback->GB_malloc_memory_func ; #endif - #include "GB_AxB_dot4_meta.c" + #include "template/GB_AxB_dot4_meta.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxbit.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxbit.c similarity index 89% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxbit.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxbit.c index 3e074b34ba..c3b0ea7f1c 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxbit.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxbit.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "include/GB_AxB_saxpy3_template.h" GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXBIT_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXBIT_PROTO (GB_jit_kernel) @@ -18,7 +18,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXBIT_PROTO (GB_jit_kernel) my_callback->GB_bitmap_M_scatter_func ; #endif - #include "GB_AxB_saxbit_template.c" + #include "template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy3.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy3.c similarity index 91% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy3.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy3.c index f4d02397af..1425727e51 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy3.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy3.c @@ -9,7 +9,7 @@ #define Mask_comp GB_MASK_COMP #define Mask_struct GB_MASK_STRUCT -#include "GB_AxB_saxpy3_template.h" +#include "include/GB_AxB_saxpy3_template.h" GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY3_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY3_PROTO (GB_jit_kernel) @@ -23,7 +23,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY3_PROTO (GB_jit_kernel) #endif ASSERT (GB_IS_SPARSE (C) || GB_IS_HYPERSPARSE (C)) ; - #include "GB_AxB_saxpy3_template.c" + #include "template/GB_AxB_saxpy3_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy4.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy4.c similarity index 87% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy4.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy4.c index ff43300964..5b9a09e075 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy4.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy4.c @@ -9,12 +9,12 @@ // C+=A*B: C is full, saxpy4 method -#include "GB_AxB_saxpy3_template.h" +#include "include/GB_AxB_saxpy3_template.h" GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY4_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY4_PROTO (GB_jit_kernel) { - #include "GB_AxB_saxpy4_meta.c" + #include "template/GB_AxB_saxpy4_meta.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy5.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy5.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy5.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy5.c index 315b3ed609..4b3acc6653 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_AxB_saxpy5.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_AxB_saxpy5.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "include/GB_AxB_saxpy3_template.h" GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) ; @@ -42,7 +42,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) ; const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -78,7 +78,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) ; const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -107,7 +107,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) ; const int64_t *B_slice ) { - #include "GB_AxB_saxpy5_unrolled.c" + #include "template/GB_AxB_saxpy5_unrolled.c" } #endif @@ -126,7 +126,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) // saxpy5: C+=A*B where A is bitmap/full and iso or pattern //---------------------------------------------------------------------- - #include "GB_AxB_saxpy5_A_iso_or_pattern.c" + #include "template/GB_AxB_saxpy5_A_iso_or_pattern.c" } #elif GB_A_IS_BITMAP @@ -136,7 +136,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_AXB_SAXPY5_PROTO (GB_jit_kernel) // saxpy5: C+=A*B where A is bitmap (but not iso or pattern) //---------------------------------------------------------------------- - #include "GB_AxB_saxpy5_A_bitmap.c" + #include "template/GB_AxB_saxpy5_A_bitmap.c" } #else diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_add.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_add.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_add.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_add.c index 13959032c1..ebce5d982e 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_add.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_add.c @@ -11,7 +11,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_ADD_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_ADD_PROTO (GB_jit_kernel) { #define GB_IS_EWISEUNION 0 - #include "GB_add_template.c" + #include "template/GB_add_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_bind1st.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_bind1st.c similarity index 91% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_bind1st.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_bind1st.c index aad7cd2349..32324415d2 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_bind1st.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_bind1st.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_APPLY_BIND1ST_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_APPLY_BIND1ST_PROTO (GB_jit_kernel) { - #include "GB_apply_bind1st_template.c" + #include "template/GB_apply_bind1st_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_bind2nd.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_bind2nd.c similarity index 91% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_bind2nd.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_bind2nd.c index eac2cac648..01a874bc84 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_bind2nd.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_bind2nd.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_APPLY_BIND2ND_PROTO(GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_APPLY_BIND2ND_PROTO(GB_jit_kernel) { - #include "GB_apply_bind2nd_template.c" + #include "template/GB_apply_bind2nd_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_unop.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_unop.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_unop.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_unop.c index f33e92677a..3e77edd111 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_apply_unop.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_apply_unop.c @@ -42,11 +42,11 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_APPLY_UNOP_PROTO (GB_jit_kernel) const int64_t *restrict Ah = A->h ; const int64_t *restrict Ai = A->i ; int64_t avlen = A->vlen ; - #include "GB_apply_unop_ijp.c" + #include "template/GB_apply_unop_ijp.c" } #else { - #include "GB_apply_unop_ip.c" + #include "template/GB_apply_unop_ip.c" } #endif diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_build.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_build.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_build.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_build.c index 6e17a00275..395daddb7f 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_build.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_build.c @@ -12,7 +12,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_BUILD_PROTO (GB_jit_kernel) { GB_T_TYPE *restrict Tx = (GB_T_TYPE *) Tx_void ; const GB_S_TYPE *restrict Sx = (GB_S_TYPE *) Sx_void ; - #include "GB_bld_template.c" + #include "template/GB_bld_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_colscale.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_colscale.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_colscale.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_colscale.c index 0fa102e74f..3417f6ecb2 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_colscale.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_colscale.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_COLSCALE_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_COLSCALE_PROTO (GB_jit_kernel) { - #include "GB_colscale_template.c" + #include "template/GB_colscale_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_bitmap.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_bitmap.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_bitmap.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_bitmap.c index 6b51615767..1f9ae289dd 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_bitmap.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_bitmap.c @@ -20,7 +20,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_CONCAT_BITMAP_PROTO (GB_jit_kernel) GB_werk_push_f GB_werk_push = my_callback->GB_werk_push_func ; #endif - #include "GB_concat_bitmap_template.c" + #include "template/GB_concat_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_full.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_full.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_full.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_full.c index f05275a5b3..231e44de00 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_full.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_full.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_CONCAT_FULL_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_CONCAT_FULL_PROTO (GB_jit_kernel) { - #include "GB_concat_full_template.c" + #include "template/GB_concat_full_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_sparse.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_sparse.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_sparse.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_sparse.c index 76d79ff728..36a7becb0b 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_concat_sparse.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_concat_sparse.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_CONCAT_SPARSE_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_CONCAT_SPARSE_PROTO (GB_jit_kernel) { - #include "GB_concat_sparse_template.c" + #include "template/GB_concat_sparse_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_convert_s2b.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_convert_s2b.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_convert_s2b.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_convert_s2b.c index 68d46dd84b..d509b8d883 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_convert_s2b.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_convert_s2b.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_CONVERT_S2B_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_CONVERT_S2B_PROTO (GB_jit_kernel) { - #include "GB_convert_s2b_template.c" + #include "template/GB_convert_s2b_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_02.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_02.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_02.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_02.c index a766157f32..4f9699479d 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_02.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_02.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_02_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_02_PROTO (GB_jit_kernel) { - #include "GB_emult_02_template.c" + #include "template/GB_emult_02_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_03.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_03.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_03.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_03.c index ac2f6b1707..e029403939 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_03.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_03.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_03_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_03_PROTO (GB_jit_kernel) { - #include "GB_emult_03_template.c" + #include "template/GB_emult_03_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_04.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_04.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_04.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_04.c index 2a1a72294a..63e4a8d7e5 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_04.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_04.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_04_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_04_PROTO (GB_jit_kernel) { - #include "GB_emult_04_template.c" + #include "template/GB_emult_04_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_08.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_08.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_08.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_08.c index a265c3fbfa..948f05dc15 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_08.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_08.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_08_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_08_PROTO (GB_jit_kernel) { - #include "GB_emult_08_meta.c" + #include "template/GB_emult_08_meta.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_bitmap.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_bitmap.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_bitmap.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_bitmap.c index 07eb43c286..043ca3564f 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_emult_bitmap.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_emult_bitmap.c @@ -16,7 +16,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EMULT_BITMAP_PROTO (GB_jit_kernel) my_callback->GB_bitmap_M_scatter_whole_func ; #endif - #include "GB_emult_bitmap_template.c" + #include "template/GB_emult_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_ewise_fulla.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_ewise_fulla.c similarity index 91% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_ewise_fulla.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_ewise_fulla.c index 1f2ebc7c39..85715b2fae 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_ewise_fulla.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_ewise_fulla.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EWISE_FULLA_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_EWISE_FULLA_PROTO (GB_jit_kernel) { - #include "GB_ewise_fulla_template.c" + #include "template/GB_ewise_fulla_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_ewise_fulln.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_ewise_fulln.c similarity index 91% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_ewise_fulln.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_ewise_fulln.c index f2be53dfd3..988931ac68 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_ewise_fulln.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_ewise_fulln.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_EWISE_FULLN_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_EWISE_FULLN_PROTO (GB_jit_kernel) { - #include "GB_ewise_fulln_template.c" + #include "template/GB_ewise_fulln_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_reduce.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_reduce.c new file mode 100644 index 0000000000..5c7ad514a8 --- /dev/null +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_reduce.c @@ -0,0 +1,173 @@ +//------------------------------------------------------------------------------ +// GB_jit_kernel_reduce.c: JIT kernel for reduction to scalar +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +//------------------------------------------------------------------------------ + +// The GB_jitifyer constructs a *.c file with macro definitions specific to the +// problem instance, such as the excerpts for the GB_jit__reduce__ac1fbb2 +// kernel, below, which a kernel that computes the scalar reduce of a double +// matrix in bitmap form, using the GrB_PLUS_FP64_MONOID. The code ac1fbb2 is +// computed by GB_enumify_reduce. The macros are followed by an #include with +// this file, to define the kernel routine itself. The kernel is always called +// GB_jit_kernel, regardless of what it computes. However, if this kernel is +// copied into GraphBLAS/PreJit, the name GB_jit_kernel is replaced with its +// full name, GB_jit__reduce__ac1fbb2, which then appears as a compiled +// function in libgraphblas.so when the GraphBLAS library itself is recompiled. + +// The GB_jit_query function provides a mechanism for GraphBLAS to query the +// kernels it has already compiled. When a compiled kernel is loaded, its +// definitions are checked to make sure they haven't changed. If the user +// application has changed the definition of a user-defined data type, for +// example, the string defn [0] would differ. See the gauss_demo program for +// an example. When GraphBLAS detects any such change, the old compiled kernel +// is discarded and a new one is compiled to match the expected definition. + +#ifdef for_comments_only // only so vim will add color to the code below: + + // example file: GB_jit__reduce__ac1fbb2.c + + //-------------------------------------------------------------------------- + // GB_jit__reduce__ac1fbb2.c + //-------------------------------------------------------------------------- + // SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, + // All Rights Reserved. + // SPDX-License-Identifier: Apache-2.0 + // The above copyright and license do not apply to any + // user-defined types and operators defined below. + //-------------------------------------------------------------------------- + + #include "include/GB_jit_kernel.h" + + // reduce: (plus, double) + + // monoid: + #define GB_Z_TYPE double + #define GB_ADD(z,x,y) z = (x) + (y) + #define GB_UPDATE(z,y) z += y + #define GB_DECLARE_IDENTITY(z) double z = 0 + #define GB_DECLARE_IDENTITY_CONST(z) const double z = 0 + #define GB_HAS_IDENTITY_BYTE 1 + #define GB_IDENTITY_BYTE 0x00 + #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) + #define GB_Z_IGNORE_OVERFLOW 1 + #define GB_Z_SIZE 8 + #define GB_Z_NBITS 64 + #define GB_Z_ATOMIC_BITS 64 + #define GB_Z_HAS_ATOMIC_UPDATE 1 + #define GB_Z_HAS_OMP_ATOMIC_UPDATE 1 + #define GB_Z_HAS_CUDA_ATOMIC_BUILTIN 1 + #define GB_Z_CUDA_ATOMIC GB_cuda_atomic_add + #define GB_Z_CUDA_ATOMIC_TYPE double + #define GB_GETA_AND_UPDATE(z,Ax,p) GB_UPDATE (z, Ax [p]) + + // A matrix: bitmap + #define GB_A_IS_HYPER 0 + #define GB_A_IS_SPARSE 0 + #define GB_A_IS_BITMAP 1 + #define GB_A_IS_FULL 0 + #define GBP_A(Ap,k,vlen) ((k) * (vlen)) + #define GBH_A(Ah,k) (k) + #define GBI_A(Ai,p,vlen) ((p) % (vlen)) + #define GBB_A(Ab,p) Ab [p] + #define GB_A_NVALS(e) int64_t e = A->nvals + #define GB_A_NHELD(e) int64_t e = (A->vlen * A->vdim) + #define GB_A_ISO 0 + #define GB_A_HAS_ZOMBIES 0 + #define GB_A_TYPE double + #define GB_A2TYPE double + #define GB_DECLAREA(a) double a + #define GB_GETA(a,Ax,p,iso) a = Ax [p] + + // panel size for reduction: + #define GB_PANEL 32 + + #include "include/GB_monoid_shared_definitions.h" + #ifndef GB_JIT_RUNTIME + #define GB_jit_kernel GB_jit__reduce__ac1fbb2 + #define GB_jit_query GB_jit__reduce__ac1fbb2_query + #endif + #include "template/GB_jit_kernel_reduce.c" + GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; + GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) + { + (*hash) = 0x5bb300ab9fd9b50c ; + v [0] = 9 ; v [1] = 3 ; v [2] = 0 ; + defn [0] = NULL ; + defn [1] = NULL ; + defn [2] = NULL ; + defn [3] = NULL ; + defn [4] = NULL ; + return (true) ; + } + +#endif + +//------------------------------------------------------------------------------ +// reduce to a non-iso matrix to scalar, for monoids only +//------------------------------------------------------------------------------ + +// The two template files GB_reduce_to_scalar_template.c and GB_reduce_panel.c +// appear in GraphBLAS/Source/reduce/template. They are used by both the +// pre-compiled kernels in GraphBLAS/FactoryKernels, and by the JIT kernel +// here. + +// The prototype of this GB_jit_kernel is defined by a macro, +// GB_JIT_KERNEL_REDUCE_PROTO, defined in +// Source/jit_kernels/include/GB_jit_kernel_proto.h: + +/* + #define GB_JIT_KERNEL_REDUCE_PROTO(GB_jit_kernel_reduce) \ + GrB_Info GB_jit_kernel_reduce \ + ( \ + GB_void *result, \ + const GrB_Matrix A, \ + GB_void *restrict Workspace, \ + bool *restrict F, \ + const int ntasks, \ + const int nthreads \ + ) +*/ + +// This macro is used because the identical prototype must appear in many +// places, but with different function names. For example, if this kernel +// is copied into GraphBLAS/PreJIT, then this macro is used to define the +// GB_jit__reduce__ac1fbb2 function, with the same set of parameters as +// given by the GB_JIT_KERNEL_REDUCE_PROTO macro above. + +GB_JIT_GLOBAL GB_JIT_KERNEL_REDUCE_PROTO (GB_jit_kernel) ; +GB_JIT_GLOBAL GB_JIT_KERNEL_REDUCE_PROTO (GB_jit_kernel) +{ + GB_Z_TYPE z = (* ((GB_Z_TYPE *) result)) ; + GB_Z_TYPE *W = (GB_Z_TYPE *) Workspace ; + // The two templates below use the F and Workspace arrays to reduce A to + // the scalar z. For OpenMP parallelism, ntasks tasks are created, and + // executed with nthreads OpenMP threads. + #if GB_A_HAS_ZOMBIES || GB_A_IS_BITMAP || (GB_PANEL == 1) + { + // The matrix A either has zombies, is in bitmap format, or the + // panel size is one. In this case, use a simpler method + // that does not use a panel workspace array. + #include "template/GB_reduce_to_scalar_template.c" + } + #else + { + // This algorithm relies on a panel array for each thread, of size + // GB_PANEL (defined above). Each task grabs a set of entries from A, + // of size GB_PANEL, and accumulates each of them in the panel. The + // task iterates over its part of the A matrix. When the task is done, + // it 'sums' its panel into a single scalar. This method is faster for + // some monoids such as (plus,double). Some monoids or data types do + // not benefit from a panel-based reduction. In this case the panel + // size is set (via GB_PANEL) to one. + #include "template/GB_reduce_panel.c" + } + #endif + // (*result) = z ; + memcpy (result, &z, sizeof (GB_Z_TYPE)) ; + return (GrB_SUCCESS) ; +} + diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_rowscale.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_rowscale.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_rowscale.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_rowscale.c index f8e08d861f..f106d70197 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_rowscale.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_rowscale.c @@ -10,7 +10,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_ROWSCALE_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_ROWSCALE_PROTO (GB_jit_kernel) { - #include "GB_rowscale_template.c" + #include "template/GB_rowscale_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_select_bitmap.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_bitmap.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_select_bitmap.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_bitmap.c index dc2272dd8c..5a179e549d 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_select_bitmap.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_bitmap.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SELECT_BITMAP_PROTO (GB_jit_kernel) #if GB_DEPENDS_ON_Y GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; #endif - #include "GB_select_bitmap_template.c" + #include "template/GB_select_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_select_phase1.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_phase1.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_select_phase1.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_phase1.c index f0daff3ed1..900aa02c9a 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_select_phase1.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_phase1.c @@ -19,7 +19,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SELECT_PHASE1_PROTO (GB_jit_kernel) #if GB_DEPENDS_ON_Y GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; #endif - #include "GB_select_entry_phase1_template.c" + #include "template/GB_select_entry_phase1_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_select_phase2.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_phase2.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_select_phase2.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_phase2.c index 8a61f249fe..2c79c7d197 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_select_phase2.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_select_phase2.c @@ -14,7 +14,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SELECT_PHASE2_PROTO (GB_jit_kernel) #if GB_DEPENDS_ON_Y GB_Y_TYPE y = *((GB_Y_TYPE *) ythunk) ; #endif - #include "GB_select_phase2.c" + #include "template/GB_select_phase2.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_split_bitmap.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_bitmap.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_split_bitmap.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_bitmap.c index a571ddcf7f..fab9474875 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_split_bitmap.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_bitmap.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SPLIT_BITMAP_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_SPLIT_BITMAP_PROTO (GB_jit_kernel) { - #include "GB_split_bitmap_template.c" + #include "template/GB_split_bitmap_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_split_full.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_full.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_split_full.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_full.c index daa92d2ed7..c8be6a81be 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_split_full.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_full.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SPLIT_FULL_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_SPLIT_FULL_PROTO (GB_jit_kernel) { - #include "GB_split_full_template.c" + #include "template/GB_split_full_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_split_sparse.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_sparse.c similarity index 92% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_split_sparse.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_sparse.c index 52fb8f1fbb..5b01600ac7 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_split_sparse.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_split_sparse.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SPLIT_SPARSE_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_SPLIT_SPARSE_PROTO (GB_jit_kernel) { - #include "GB_split_sparse_template.c" + #include "template/GB_split_sparse_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_05d.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_05d.c similarity index 96% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_05d.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_05d.c index b9f6076c2b..24785b0c1e 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_05d.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_05d.c @@ -35,7 +35,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SUBASSIGN_PROTO (GB_jit_kernel) #endif GB_C_TYPE cwork = (*((GB_C_TYPE *) scalar)) ; - #include "GB_subassign_05d_template.c" + #include "template/GB_subassign_05d_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_06d.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_06d.c similarity index 97% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_06d.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_06d.c index 7dd5f5df65..eb8dcfb359 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_06d.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_06d.c @@ -41,7 +41,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SUBASSIGN_PROTO (GB_jit_kernel) GB_memset_f GB_memset = my_callback->GB_memset_func ; #endif - #include "GB_subassign_06d_template.c" + #include "template/GB_subassign_06d_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_22.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_22.c similarity index 96% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_22.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_22.c index b781051f39..adc1339d7e 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_22.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_22.c @@ -32,7 +32,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SUBASSIGN_PROTO (GB_jit_kernel) #endif GB_Y_TYPE ywork = (*((GB_Y_TYPE *) scalar)) ; - #include "GB_subassign_22_template.c" + #include "template/GB_subassign_22_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_23.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_23.c similarity index 96% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_23.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_23.c index b15f0d8ff6..cfa0fc49e8 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_23.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_23.c @@ -33,7 +33,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SUBASSIGN_PROTO (GB_jit_kernel) GB_werk_push_f GB_werk_push = my_callback->GB_werk_push_func ; #endif - #include "GB_subassign_23_template.c" + #include "template/GB_subassign_23_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_25.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_25.c similarity index 97% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_25.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_25.c index 6fb7437190..25998425f6 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_subassign_25.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_subassign_25.c @@ -39,7 +39,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_SUBASSIGN_PROTO (GB_jit_kernel) GB_werk_push_f GB_werk_push = my_callback->GB_werk_push_func ; #endif - #include "GB_subassign_25_template.c" + #include "template/GB_subassign_25_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_bind1st.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_bind1st.c similarity index 95% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_bind1st.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_bind1st.c index 42d11bd0be..7ad57d9cb2 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_bind1st.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_bind1st.c @@ -20,7 +20,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_TRANS_BIND1ST_PROTO (GB_jit_kernel) { #define GB_BIND_1ST GB_X_TYPE x = (*((const GB_X_TYPE *) x_input)) ; - #include "GB_transpose_template.c" + #include "template/GB_transpose_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_bind2nd.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_bind2nd.c similarity index 95% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_bind2nd.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_bind2nd.c index 26ee9a5327..ee54e5af91 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_bind2nd.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_bind2nd.c @@ -20,7 +20,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_TRANS_BIND2ND_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_TRANS_BIND2ND_PROTO (GB_jit_kernel) { GB_Y_TYPE y = (*((const GB_Y_TYPE *) y_input)) ; - #include "GB_transpose_template.c" + #include "template/GB_transpose_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_unop.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_unop.c similarity index 93% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_unop.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_unop.c index 7446c24d2c..3f9ca663a6 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_trans_unop.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_trans_unop.c @@ -15,7 +15,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_TRANS_UNOP_PROTO (GB_jit_kernel) ; GB_JIT_GLOBAL GB_JIT_KERNEL_TRANS_UNOP_PROTO (GB_jit_kernel) { - #include "GB_transpose_template.c" + #include "template/GB_transpose_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_union.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_union.c similarity index 94% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_union.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_union.c index 0fa83bed75..dc33a9cb04 100644 --- a/GraphBLAS/Source/JitKernels/GB_jit_kernel_union.c +++ b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_union.c @@ -13,7 +13,7 @@ GB_JIT_GLOBAL GB_JIT_KERNEL_UNION_PROTO (GB_jit_kernel) #define GB_IS_EWISEUNION 1 GB_X_TYPE alpha_scalar = (*((GB_X_TYPE *) alpha_scalar_in)) ; GB_Y_TYPE beta_scalar = (*((GB_Y_TYPE *) beta_scalar_in )) ; - #include "GB_add_template.c" + #include "template/GB_add_template.c" return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_user_op.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_user_op.c similarity index 100% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_user_op.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_user_op.c diff --git a/GraphBLAS/Source/JitKernels/GB_jit_kernel_user_type.c b/GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_user_type.c similarity index 100% rename from GraphBLAS/Source/JitKernels/GB_jit_kernel_user_type.c rename to GraphBLAS/Source/jit_kernels/template/GB_jit_kernel_user_type.c diff --git a/GraphBLAS/Source/GB_AxB_dot2_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot2_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_dot2_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_dot2_jit.c index 8cc59bc317..57d4c26742 100644 --- a/GraphBLAS/Source/GB_AxB_dot2_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot2_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_DOT2_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_dot2n_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot2n_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_dot2n_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_dot2n_jit.c index f1d12ca283..e3ac8637b7 100644 --- a/GraphBLAS/Source/GB_AxB_dot2n_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot2n_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_DOT2N_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_dot3_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot3_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_dot3_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_dot3_jit.c index d9bf377cda..72381dde43 100644 --- a/GraphBLAS/Source/GB_AxB_dot3_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot3_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_DOT3_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_dot4_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot4_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_dot4_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_dot4_jit.c index ca5507bdf3..84f4c8f73f 100644 --- a/GraphBLAS/Source/GB_AxB_dot4_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_dot4_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_DOT4_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_saxbit_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxbit_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_saxbit_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_saxbit_jit.c index c8040974da..dacb388b49 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxbit_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_SAXBIT_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy3_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_saxpy3_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy3_jit.c index 647468d301..4529a7c4c3 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy3_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_SAXPY3_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_saxpy4_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy4_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_saxpy4_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy4_jit.c index 5b711dd64c..8a587fea91 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy4_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy4_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_SAXPY4_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_AxB_saxpy5_jit.c b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy5_jit.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_saxpy5_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy5_jit.c index 6f4929ef08..0bf6c7019e 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy5_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_AxB_saxpy5_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_AXB_SAXPY5_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_add_jit.c b/GraphBLAS/Source/jit_wrappers/GB_add_jit.c similarity index 98% rename from GraphBLAS/Source/GB_add_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_add_jit.c index 7b55156ce0..1661057d28 100644 --- a/GraphBLAS/Source/GB_add_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_add_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_ADD_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_apply_bind1st_jit.c b/GraphBLAS/Source/jit_wrappers/GB_apply_bind1st_jit.c similarity index 98% rename from GraphBLAS/Source/GB_apply_bind1st_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_apply_bind1st_jit.c index 40c5b29fb6..d967c9a395 100644 --- a/GraphBLAS/Source/GB_apply_bind1st_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_apply_bind1st_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_APPLY_BIND1ST_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_apply_bind2nd_jit.c b/GraphBLAS/Source/jit_wrappers/GB_apply_bind2nd_jit.c similarity index 98% rename from GraphBLAS/Source/GB_apply_bind2nd_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_apply_bind2nd_jit.c index faed5d09f9..bea0b0fc26 100644 --- a/GraphBLAS/Source/GB_apply_bind2nd_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_apply_bind2nd_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_APPLY_BIND2ND_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_apply_unop_jit.c b/GraphBLAS/Source/jit_wrappers/GB_apply_unop_jit.c similarity index 98% rename from GraphBLAS/Source/GB_apply_unop_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_apply_unop_jit.c index d2c90d88f4..dbe1810120 100644 --- a/GraphBLAS/Source/GB_apply_unop_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_apply_unop_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_APPLY_UNOP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_build_jit.c b/GraphBLAS/Source/jit_wrappers/GB_build_jit.c similarity index 98% rename from GraphBLAS/Source/GB_build_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_build_jit.c index bb0b18104f..83225f73ca 100644 --- a/GraphBLAS/Source/GB_build_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_build_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_BUILD_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_colscale_jit.c b/GraphBLAS/Source/jit_wrappers/GB_colscale_jit.c similarity index 98% rename from GraphBLAS/Source/GB_colscale_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_colscale_jit.c index e3f6b2cc4f..5bea4ee582 100644 --- a/GraphBLAS/Source/GB_colscale_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_colscale_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_COLSCALE_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_concat_bitmap_jit.c b/GraphBLAS/Source/jit_wrappers/GB_concat_bitmap_jit.c similarity index 98% rename from GraphBLAS/Source/GB_concat_bitmap_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_concat_bitmap_jit.c index 863d81e2dd..3125b09596 100644 --- a/GraphBLAS/Source/GB_concat_bitmap_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_concat_bitmap_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_CONCAT_BITMAP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_concat_full_jit.c b/GraphBLAS/Source/jit_wrappers/GB_concat_full_jit.c similarity index 98% rename from GraphBLAS/Source/GB_concat_full_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_concat_full_jit.c index 5bb89f7c61..b648c74bb9 100644 --- a/GraphBLAS/Source/GB_concat_full_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_concat_full_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_CONCAT_FULL_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_concat_sparse_jit.c b/GraphBLAS/Source/jit_wrappers/GB_concat_sparse_jit.c similarity index 98% rename from GraphBLAS/Source/GB_concat_sparse_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_concat_sparse_jit.c index 18f5f291b3..c682a91ea2 100644 --- a/GraphBLAS/Source/GB_concat_sparse_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_concat_sparse_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_CONCAT_SPARSE_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_convert_s2b_jit.c b/GraphBLAS/Source/jit_wrappers/GB_convert_s2b_jit.c similarity index 98% rename from GraphBLAS/Source/GB_convert_s2b_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_convert_s2b_jit.c index 07e7080e81..91ce75535a 100644 --- a/GraphBLAS/Source/GB_convert_s2b_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_convert_s2b_jit.c @@ -11,7 +11,7 @@ // (except for identity), but this could be revised in the future. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_CONVERT_S2B_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_emult_02_jit.c b/GraphBLAS/Source/jit_wrappers/GB_emult_02_jit.c similarity index 98% rename from GraphBLAS/Source/GB_emult_02_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_emult_02_jit.c index 11e8dba5b7..b062cca3cd 100644 --- a/GraphBLAS/Source/GB_emult_02_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_emult_02_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EMULT_02_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_emult_03_jit.c b/GraphBLAS/Source/jit_wrappers/GB_emult_03_jit.c similarity index 98% rename from GraphBLAS/Source/GB_emult_03_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_emult_03_jit.c index b9b3817ae1..babe9bee5b 100644 --- a/GraphBLAS/Source/GB_emult_03_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_emult_03_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EMULT_03_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_emult_04_jit.c b/GraphBLAS/Source/jit_wrappers/GB_emult_04_jit.c similarity index 98% rename from GraphBLAS/Source/GB_emult_04_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_emult_04_jit.c index 959cbf9957..ae8972ccaa 100644 --- a/GraphBLAS/Source/GB_emult_04_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_emult_04_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EMULT_04_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_emult_08_jit.c b/GraphBLAS/Source/jit_wrappers/GB_emult_08_jit.c similarity index 98% rename from GraphBLAS/Source/GB_emult_08_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_emult_08_jit.c index dc7dea26d1..2c5aed8421 100644 --- a/GraphBLAS/Source/GB_emult_08_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_emult_08_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EMULT_08_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_emult_bitmap_jit.c b/GraphBLAS/Source/jit_wrappers/GB_emult_bitmap_jit.c similarity index 98% rename from GraphBLAS/Source/GB_emult_bitmap_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_emult_bitmap_jit.c index 706bcf230f..228e37cba3 100644 --- a/GraphBLAS/Source/GB_emult_bitmap_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_emult_bitmap_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EMULT_BITMAP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_ewise_fulla_jit.c b/GraphBLAS/Source/jit_wrappers/GB_ewise_fulla_jit.c similarity index 98% rename from GraphBLAS/Source/GB_ewise_fulla_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_ewise_fulla_jit.c index 68af762152..e385a01669 100644 --- a/GraphBLAS/Source/GB_ewise_fulla_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_ewise_fulla_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EWISE_FULLA_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_ewise_fulln_jit.c b/GraphBLAS/Source/jit_wrappers/GB_ewise_fulln_jit.c similarity index 98% rename from GraphBLAS/Source/GB_ewise_fulln_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_ewise_fulln_jit.c index fc9c32b5fc..c4e036cf44 100644 --- a/GraphBLAS/Source/GB_ewise_fulln_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_ewise_fulln_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_EWISE_FULLN_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_reduce_to_scalar_jit.c b/GraphBLAS/Source/jit_wrappers/GB_reduce_to_scalar_jit.c similarity index 98% rename from GraphBLAS/Source/GB_reduce_to_scalar_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_reduce_to_scalar_jit.c index 991c48b0e9..e544f5d1c1 100644 --- a/GraphBLAS/Source/GB_reduce_to_scalar_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_reduce_to_scalar_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_REDUCE_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_rowscale_jit.c b/GraphBLAS/Source/jit_wrappers/GB_rowscale_jit.c similarity index 98% rename from GraphBLAS/Source/GB_rowscale_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_rowscale_jit.c index 3b7b08c117..2d11073765 100644 --- a/GraphBLAS/Source/GB_rowscale_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_rowscale_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_ROWSCALE_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_select_bitmap_jit.c b/GraphBLAS/Source/jit_wrappers/GB_select_bitmap_jit.c similarity index 98% rename from GraphBLAS/Source/GB_select_bitmap_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_select_bitmap_jit.c index 5011ecab06..aff835b136 100644 --- a/GraphBLAS/Source/GB_select_bitmap_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_select_bitmap_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SELECT_BITMAP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_select_phase1_jit.c b/GraphBLAS/Source/jit_wrappers/GB_select_phase1_jit.c similarity index 98% rename from GraphBLAS/Source/GB_select_phase1_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_select_phase1_jit.c index 483f878ab3..c812e9a1c6 100644 --- a/GraphBLAS/Source/GB_select_phase1_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_select_phase1_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SELECT_PHASE1_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_select_phase2_jit.c b/GraphBLAS/Source/jit_wrappers/GB_select_phase2_jit.c similarity index 98% rename from GraphBLAS/Source/GB_select_phase2_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_select_phase2_jit.c index 419bf9044a..bd05baf6e7 100644 --- a/GraphBLAS/Source/GB_select_phase2_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_select_phase2_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SELECT_PHASE2_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_split_bitmap_jit.c b/GraphBLAS/Source/jit_wrappers/GB_split_bitmap_jit.c similarity index 98% rename from GraphBLAS/Source/GB_split_bitmap_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_split_bitmap_jit.c index 904bb9cae4..22ab90fe5c 100644 --- a/GraphBLAS/Source/GB_split_bitmap_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_split_bitmap_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SPLIT_BITMAP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_split_full_jit.c b/GraphBLAS/Source/jit_wrappers/GB_split_full_jit.c similarity index 98% rename from GraphBLAS/Source/GB_split_full_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_split_full_jit.c index 5627037dad..baf9b388fd 100644 --- a/GraphBLAS/Source/GB_split_full_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_split_full_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SPLIT_FULL_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_split_sparse_jit.c b/GraphBLAS/Source/jit_wrappers/GB_split_sparse_jit.c similarity index 98% rename from GraphBLAS/Source/GB_split_sparse_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_split_sparse_jit.c index a16681a325..cb6a1bb9f8 100644 --- a/GraphBLAS/Source/GB_split_sparse_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_split_sparse_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SPLIT_SPARSE_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_subassign_jit.c b/GraphBLAS/Source/jit_wrappers/GB_subassign_jit.c similarity index 98% rename from GraphBLAS/Source/GB_subassign_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_subassign_jit.c index cc42194240..f728fa9888 100644 --- a/GraphBLAS/Source/GB_subassign_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_subassign_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_SUBASSIGN_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_transpose_bind1st_jit.c b/GraphBLAS/Source/jit_wrappers/GB_transpose_bind1st_jit.c similarity index 98% rename from GraphBLAS/Source/GB_transpose_bind1st_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_transpose_bind1st_jit.c index 2e2d217aa1..18f19d3f3a 100644 --- a/GraphBLAS/Source/GB_transpose_bind1st_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_transpose_bind1st_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_TRANS_BIND1ST_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_transpose_bind2nd_jit.c b/GraphBLAS/Source/jit_wrappers/GB_transpose_bind2nd_jit.c similarity index 98% rename from GraphBLAS/Source/GB_transpose_bind2nd_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_transpose_bind2nd_jit.c index 84402e0743..d9303fa51f 100644 --- a/GraphBLAS/Source/GB_transpose_bind2nd_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_transpose_bind2nd_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_TRANS_BIND2ND_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_transpose_unop_jit.c b/GraphBLAS/Source/jit_wrappers/GB_transpose_unop_jit.c similarity index 98% rename from GraphBLAS/Source/GB_transpose_unop_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_transpose_unop_jit.c index bc84c9117f..05a3bb985f 100644 --- a/GraphBLAS/Source/GB_transpose_unop_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_transpose_unop_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_TRANS_UNOP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_union_jit.c b/GraphBLAS/Source/jit_wrappers/GB_union_jit.c similarity index 98% rename from GraphBLAS/Source/GB_union_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_union_jit.c index a937511342..eccb15d56e 100644 --- a/GraphBLAS/Source/GB_union_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_union_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_UNION_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_user_op_jit.c b/GraphBLAS/Source/jit_wrappers/GB_user_op_jit.c similarity index 98% rename from GraphBLAS/Source/GB_user_op_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_user_op_jit.c index e577a3c906..3817ae9a0e 100644 --- a/GraphBLAS/Source/GB_user_op_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_user_op_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_USER_OP_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_user_type_jit.c b/GraphBLAS/Source/jit_wrappers/GB_user_type_jit.c similarity index 98% rename from GraphBLAS/Source/GB_user_type_jit.c rename to GraphBLAS/Source/jit_wrappers/GB_user_type_jit.c index 0da1d0ab3f..ec340a3a4e 100644 --- a/GraphBLAS/Source/GB_user_type_jit.c +++ b/GraphBLAS/Source/jit_wrappers/GB_user_type_jit.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" typedef GB_JIT_KERNEL_USER_TYPE_PROTO ((*GB_jit_dl_function)) ; diff --git a/GraphBLAS/Source/GB_demacrofy_name.c b/GraphBLAS/Source/jitifyer/GB_demacrofy_name.c similarity index 99% rename from GraphBLAS/Source/GB_demacrofy_name.c rename to GraphBLAS/Source/jitifyer/GB_demacrofy_name.c index 78f6861aec..8357c0ba11 100644 --- a/GraphBLAS/Source/GB_demacrofy_name.c +++ b/GraphBLAS/Source/jitifyer/GB_demacrofy_name.c @@ -29,7 +29,7 @@ // The suffix is used only for user-defined types and operators. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" GrB_Info GB_demacrofy_name ( diff --git a/GraphBLAS/Source/GB_encodify_apply.c b/GraphBLAS/Source/jitifyer/GB_encodify_apply.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_apply.c rename to GraphBLAS/Source/jitifyer/GB_encodify_apply.c index 0a587748c4..bd3221cd27 100644 --- a/GraphBLAS/Source/GB_encodify_apply.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_apply.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_apply // encode an apply problem ( diff --git a/GraphBLAS/Source/GB_encodify_assign.c b/GraphBLAS/Source/jitifyer/GB_encodify_assign.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_assign.c rename to GraphBLAS/Source/jitifyer/GB_encodify_assign.c index 025340fd69..3879ff95ea 100644 --- a/GraphBLAS/Source/GB_encodify_assign.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_assign.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_assign // encode an assign problem ( diff --git a/GraphBLAS/Source/GB_encodify_build.c b/GraphBLAS/Source/jitifyer/GB_encodify_build.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_build.c rename to GraphBLAS/Source/jitifyer/GB_encodify_build.c index 464568cdb2..3bc0a145d2 100644 --- a/GraphBLAS/Source/GB_encodify_build.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_build.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_build // encode an build problem ( diff --git a/GraphBLAS/Source/GB_encodify_ewise.c b/GraphBLAS/Source/jitifyer/GB_encodify_ewise.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_ewise.c rename to GraphBLAS/Source/jitifyer/GB_encodify_ewise.c index d88b37ce3c..03a6f5385b 100644 --- a/GraphBLAS/Source/GB_encodify_ewise.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_ewise.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_ewise // encode an ewise problem ( diff --git a/GraphBLAS/Source/GB_encodify_mxm.c b/GraphBLAS/Source/jitifyer/GB_encodify_mxm.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_mxm.c rename to GraphBLAS/Source/jitifyer/GB_encodify_mxm.c index b639941f1d..d6be0f223a 100644 --- a/GraphBLAS/Source/GB_encodify_mxm.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_mxm.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_mxm // encode a GrB_mxm problem ( diff --git a/GraphBLAS/Source/GB_encodify_reduce.c b/GraphBLAS/Source/jitifyer/GB_encodify_reduce.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_reduce.c rename to GraphBLAS/Source/jitifyer/GB_encodify_reduce.c index 5112883246..79301d3a41 100644 --- a/GraphBLAS/Source/GB_encodify_reduce.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_reduce.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_reduce // encode a GrB_reduce problem ( diff --git a/GraphBLAS/Source/GB_encodify_select.c b/GraphBLAS/Source/jitifyer/GB_encodify_select.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_select.c rename to GraphBLAS/Source/jitifyer/GB_encodify_select.c index 61517d03f0..4f180ddb7a 100644 --- a/GraphBLAS/Source/GB_encodify_select.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_select.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_select // encode an select problem ( diff --git a/GraphBLAS/Source/GB_encodify_user_op.c b/GraphBLAS/Source/jitifyer/GB_encodify_user_op.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_user_op.c rename to GraphBLAS/Source/jitifyer/GB_encodify_user_op.c index a083337955..1bda7c7d93 100644 --- a/GraphBLAS/Source/GB_encodify_user_op.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_user_op.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_user_op // encode a user defined op ( diff --git a/GraphBLAS/Source/GB_encodify_user_type.c b/GraphBLAS/Source/jitifyer/GB_encodify_user_type.c similarity index 98% rename from GraphBLAS/Source/GB_encodify_user_type.c rename to GraphBLAS/Source/jitifyer/GB_encodify_user_type.c index c5bbdc0ed2..fc3835a15a 100644 --- a/GraphBLAS/Source/GB_encodify_user_type.c +++ b/GraphBLAS/Source/jitifyer/GB_encodify_user_type.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" uint64_t GB_encodify_user_type // encode a user defined type ( diff --git a/GraphBLAS/Source/GB_enumify_apply.c b/GraphBLAS/Source/jitifyer/GB_enumify_apply.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_apply.c rename to GraphBLAS/Source/jitifyer/GB_enumify_apply.c index 9c53ed333e..a7e15b11cd 100644 --- a/GraphBLAS/Source/GB_enumify_apply.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_apply.c @@ -12,7 +12,7 @@ // binary (that is handled as an ewise enumify). #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_apply // enumerate an apply or tranpose/apply problem ( diff --git a/GraphBLAS/Source/GB_enumify_assign.c b/GraphBLAS/Source/jitifyer/GB_enumify_assign.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_assign.c rename to GraphBLAS/Source/jitifyer/GB_enumify_assign.c index 1fa6760e25..f3883f6ac0 100644 --- a/GraphBLAS/Source/GB_enumify_assign.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_assign.c @@ -60,7 +60,7 @@ // GB_bitmap_assign_notM_noaccum_whole #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_assign // enumerate a GrB_assign problem ( diff --git a/GraphBLAS/Source/GB_enumify_binop.c b/GraphBLAS/Source/jitifyer/GB_enumify_binop.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_binop.c rename to GraphBLAS/Source/jitifyer/GB_enumify_binop.c index e89163df66..2ddf544d40 100644 --- a/GraphBLAS/Source/GB_enumify_binop.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_binop.c @@ -11,7 +11,7 @@ // ecodes 32 and up are not valid for use in a monoid; only 32:139 are in use. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_binop ( diff --git a/GraphBLAS/Source/GB_enumify_build.c b/GraphBLAS/Source/jitifyer/GB_enumify_build.c similarity index 98% rename from GraphBLAS/Source/GB_enumify_build.c rename to GraphBLAS/Source/jitifyer/GB_enumify_build.c index da082a6991..31e8577211 100644 --- a/GraphBLAS/Source/GB_enumify_build.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_build.c @@ -10,7 +10,7 @@ // Enumify an build operation. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_build // enumerate a GB_build problem ( diff --git a/GraphBLAS/Source/GB_enumify_cuda_atomic.c b/GraphBLAS/Source/jitifyer/GB_enumify_cuda_atomic.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_cuda_atomic.c rename to GraphBLAS/Source/jitifyer/GB_enumify_cuda_atomic.c index e10b97dc39..24830a8d2d 100644 --- a/GraphBLAS/Source/GB_enumify_cuda_atomic.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_cuda_atomic.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" bool GB_enumify_cuda_atomic ( diff --git a/GraphBLAS/Source/GB_enumify_ewise.c b/GraphBLAS/Source/jitifyer/GB_enumify_ewise.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_ewise.c rename to GraphBLAS/Source/jitifyer/GB_enumify_ewise.c index a57edc9ddf..d94d5fdabb 100644 --- a/GraphBLAS/Source/GB_enumify_ewise.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_ewise.c @@ -12,7 +12,7 @@ // bind 1st and 2nd, etc. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" // accum is not present. Kernels that use it would require accum to be // the same as the binary operator (but this may change in the future). diff --git a/GraphBLAS/Source/GB_enumify_identity.c b/GraphBLAS/Source/jitifyer/GB_enumify_identity.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_identity.c rename to GraphBLAS/Source/jitifyer/GB_enumify_identity.c index a2819aa58f..563b20fdb0 100644 --- a/GraphBLAS/Source/GB_enumify_identity.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_identity.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_identity ( diff --git a/GraphBLAS/Source/GB_enumify_mask.c b/GraphBLAS/Source/jitifyer/GB_enumify_mask.c similarity index 98% rename from GraphBLAS/Source/GB_enumify_mask.c rename to GraphBLAS/Source/jitifyer/GB_enumify_mask.c index 127b9c42e6..05f2e72374 100644 --- a/GraphBLAS/Source/GB_enumify_mask.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_mask.c @@ -11,7 +11,7 @@ // as structural masks. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_mask // return enum to define mask macros ( diff --git a/GraphBLAS/Source/GB_enumify_monoid.c b/GraphBLAS/Source/jitifyer/GB_enumify_monoid.c similarity index 96% rename from GraphBLAS/Source/GB_enumify_monoid.c rename to GraphBLAS/Source/jitifyer/GB_enumify_monoid.c index 40b6e56f74..dac8563363 100644 --- a/GraphBLAS/Source/GB_enumify_monoid.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_monoid.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_monoid // enumerate a monoid ( diff --git a/GraphBLAS/Source/GB_enumify_mxm.c b/GraphBLAS/Source/jitifyer/GB_enumify_mxm.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_mxm.c rename to GraphBLAS/Source/jitifyer/GB_enumify_mxm.c index 86a78e13c6..023c114c07 100644 --- a/GraphBLAS/Source/GB_enumify_mxm.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_mxm.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" // dot3: C=A'*B, no accum // saxpy diff --git a/GraphBLAS/Source/GB_enumify_reduce.c b/GraphBLAS/Source/jitifyer/GB_enumify_reduce.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_reduce.c rename to GraphBLAS/Source/jitifyer/GB_enumify_reduce.c index a1c773eba6..f39672bf66 100644 --- a/GraphBLAS/Source/GB_enumify_reduce.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_reduce.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" // Returns true if all types and operators are built-in. diff --git a/GraphBLAS/Source/GB_enumify_select.c b/GraphBLAS/Source/jitifyer/GB_enumify_select.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_select.c rename to GraphBLAS/Source/jitifyer/GB_enumify_select.c index 5167d9e7e7..f7878092ad 100644 --- a/GraphBLAS/Source/GB_enumify_select.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_select.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" // Currently, the mask M and the accum are not present, and C and A have the // same type, but these conditions may change in the future. diff --git a/GraphBLAS/Source/GB_enumify_sparsity.c b/GraphBLAS/Source/jitifyer/GB_enumify_sparsity.c similarity index 97% rename from GraphBLAS/Source/GB_enumify_sparsity.c rename to GraphBLAS/Source/jitifyer/GB_enumify_sparsity.c index d8e296e4e8..97c386c3d3 100644 --- a/GraphBLAS/Source/GB_enumify_sparsity.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_sparsity.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_sparsity // enumerate the sparsity structure of a matrix ( diff --git a/GraphBLAS/Source/GB_enumify_terminal.c b/GraphBLAS/Source/jitifyer/GB_enumify_terminal.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_terminal.c rename to GraphBLAS/Source/jitifyer/GB_enumify_terminal.c index 65ede5bc9f..f5fa56b7d0 100644 --- a/GraphBLAS/Source/GB_enumify_terminal.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_terminal.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_terminal // enumify the terminal value ( diff --git a/GraphBLAS/Source/GB_enumify_unop.c b/GraphBLAS/Source/jitifyer/GB_enumify_unop.c similarity index 99% rename from GraphBLAS/Source/GB_enumify_unop.c rename to GraphBLAS/Source/jitifyer/GB_enumify_unop.c index 460576426e..93999689cd 100644 --- a/GraphBLAS/Source/GB_enumify_unop.c +++ b/GraphBLAS/Source/jitifyer/GB_enumify_unop.c @@ -20,7 +20,7 @@ // void f (void *z, const void *x, uint64_t i, uint64_t j, const void *y) #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_enumify_unop // enumify a GrB_UnaryOp or GrB_IndexUnaryOp ( diff --git a/GraphBLAS/Source/GB_file.c b/GraphBLAS/Source/jitifyer/GB_file.c similarity index 99% rename from GraphBLAS/Source/GB_file.c rename to GraphBLAS/Source/jitifyer/GB_file.c index 4c55da31f7..a76d7c73db 100644 --- a/GraphBLAS/Source/GB_file.c +++ b/GraphBLAS/Source/jitifyer/GB_file.c @@ -20,7 +20,7 @@ // https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/unlock-file #include "GB.h" -#include "GB_file.h" +#include "jitifyer/GB_file.h" #ifndef NJIT diff --git a/GraphBLAS/Source/GB_file.h b/GraphBLAS/Source/jitifyer/GB_file.h similarity index 100% rename from GraphBLAS/Source/GB_file.h rename to GraphBLAS/Source/jitifyer/GB_file.h diff --git a/GraphBLAS/Source/GB_jitifyer.c b/GraphBLAS/Source/jitifyer/GB_jitifyer.c similarity index 98% rename from GraphBLAS/Source/GB_jitifyer.c rename to GraphBLAS/Source/jitifyer/GB_jitifyer.c index f10d0d4450..ca222a06f6 100644 --- a/GraphBLAS/Source/GB_jitifyer.c +++ b/GraphBLAS/Source/jitifyer/GB_jitifyer.c @@ -8,11 +8,11 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" #include "GB_config.h" -#include "GB_zstd.h" -#include "GB_JITpackage.h" -#include "GB_file.h" +#include "zstd_wrapper/GB_zstd.h" +#include "JITpackage/GB_JITpackage.h" +#include "jitifyer/GB_file.h" typedef GB_JIT_KERNEL_USER_OP_PROTO ((*GB_user_op_f)) ; typedef GB_JIT_KERNEL_USER_TYPE_PROTO ((*GB_user_type_f)) ; @@ -608,9 +608,15 @@ GrB_Info GB_jitifyer_establish_paths (GrB_Info error_condition) ok = ok && GB_jitifyer_path_256 ("lib") ; ok = ok && GB_jitifyer_path_256 ("lock") ; - // construct the src path + // construct the src path and its subfolders snprintf (GB_jit_temp, GB_jit_temp_allocated, "%s/src", GB_jit_cache_path) ; ok = ok && GB_file_mkdir (GB_jit_temp) ; + snprintf (GB_jit_temp, GB_jit_temp_allocated, "%s/src/template", + GB_jit_cache_path) ; + ok = ok && GB_file_mkdir (GB_jit_temp) ; + snprintf (GB_jit_temp, GB_jit_temp_allocated, "%s/src/include", + GB_jit_cache_path) ; + ok = ok && GB_file_mkdir (GB_jit_temp) ; // construct the tmp path snprintf (GB_jit_temp, GB_jit_temp_allocated, "%s/tmp", GB_jit_cache_path) ; @@ -1927,7 +1933,7 @@ GrB_Info GB_jitifyer_load_worker "#define GB_jit_kernel %s\n" "#define GB_jit_query %s_query\n" "#endif\n" - "#include \"GB_jit_kernel_%s.%s\"\n", + "#include \"template/GB_jit_kernel_%s.%s\"\n", kernel_name, kernel_name, kname, kernel_filetype) ; @@ -2372,9 +2378,12 @@ void GB_jitifyer_cmake_compile (char *kernel_name, uint64_t hash) fprintf (fp, "cmake_minimum_required ( VERSION 3.13 )\n" // end user needs cmake 3.13 "project ( GBjit LANGUAGES C )\n" - "include_directories ( \"%s/src\"%s)\n" + "include_directories ( \"%s/src\" \"%s/src/template\"" + " \"%s/src/include\" %s)\n" "add_compile_definitions ( GB_JIT_RUNTIME )\n", - GB_jit_cache_path, // include directories: cache/src + GB_jit_cache_path, // include: cache/src + GB_jit_cache_path, // include: cache/src/template + GB_jit_cache_path, // include: cache/src/include ((strlen (GB_OMP_INC_DIRS) == 0) ? " " : " \"" GB_OMP_INC_DIRS "\" ")) ; // print the C flags, but escape any double quote characters fprintf (fp, "set ( CMAKE_C_FLAGS \"") ; @@ -2491,7 +2500,9 @@ void GB_jitifyer_nvcc_compile (char *kernel_name, uint32_t bucket) " -fPIC " // FIXME: add GB_CUDA_FLAGS here: " -G " // HACK FIXME (for CUDA) - "-I '%s/src' " // include source directory + "-I'%s/src' " // include source directory + "-I'%s/src/template' " + "-I'%s/src/include' " "-o '%s/c/%02x/%s%s' " // *.o output file "-c '%s/c/%02x/%s.cu' " // *.cu input file "%s " // burble stdout @@ -2510,7 +2521,9 @@ void GB_jitifyer_nvcc_compile (char *kernel_name, uint32_t bucket) "%s %s%s%s\"", // error log file // compile: - GB_jit_cache_path, // include source directory (cache/src) + GB_jit_cache_path, // include cache/src + GB_jit_cache_path, // include cache/src/template + GB_jit_cache_path, // include cache/src/include GB_jit_cache_path, bucket, kernel_name, GB_OBJ_SUFFIX, // *.o output file GB_jit_cache_path, bucket, kernel_name, // *.cu input file burble_stdout, // burble stdout @@ -2566,6 +2579,8 @@ void GB_jitifyer_direct_compile (char *kernel_name, uint32_t bucket) "%s " // compiler command "-DGB_JIT_RUNTIME=1 %s " // C flags "-I'%s/src' " // include source directory + "-I'%s/src/template' " + "-I'%s/src/include' " "%s " // openmp include directories "-o '%s/c/%02x/%s%s' " // *.o output file "-c '%s/c/%02x/%s.c' " // *.c input file @@ -2585,7 +2600,9 @@ void GB_jitifyer_direct_compile (char *kernel_name, uint32_t bucket) // compile: GB_jit_C_compiler, // C compiler GB_jit_C_flags, // C flags - GB_jit_cache_path, // include source directory (cache/src) + GB_jit_cache_path, // include cache/src + GB_jit_cache_path, // include cache/src/template + GB_jit_cache_path, // include cache/src/include GB_OMP_INC, // openmp include GB_jit_cache_path, bucket, kernel_name, GB_OBJ_SUFFIX, // *.o output file GB_jit_cache_path, bucket, kernel_name, // *.c input file diff --git a/GraphBLAS/Source/GB_jitifyer.h b/GraphBLAS/Source/jitifyer/GB_jitifyer.h similarity index 99% rename from GraphBLAS/Source/GB_jitifyer.h rename to GraphBLAS/Source/jitifyer/GB_jitifyer.h index 82da326310..f41f1d99a9 100644 --- a/GraphBLAS/Source/GB_jitifyer.h +++ b/GraphBLAS/Source/jitifyer/GB_jitifyer.h @@ -10,7 +10,7 @@ #ifndef GB_JITIFYER_H #define GB_JITIFYER_H -#include "GB_jit_kernel_proto.h" +#include "jit_kernels/include/GB_jit_kernel_proto.h" //------------------------------------------------------------------------------ // get list of PreJIT kernels: function pointers and names @@ -165,7 +165,7 @@ typedef enum GB_JIT_KERNEL_KRONER = 83, // GB_kroner // future:: utilities: - GB_JIT_KERNEL_CHECKISO = 84, // GB_check_if_iso + GB_JIT_KERNEL_CHECKISO = 84, // GB_all_entries_are_iso GB_JIT_KERNEL_CONVERTBITMAP = 85, // GB_convert_bitmap_worker GB_JIT_KERNEL_EXPANDISO = 86, // GB_expand_iso GB_JIT_KERNEL_SORT = 87, // GB_sort diff --git a/GraphBLAS/Source/GB_macrofy_apply.c b/GraphBLAS/Source/jitifyer/GB_macrofy_apply.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_apply.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_apply.c index 73b58213f2..394f831feb 100644 --- a/GraphBLAS/Source/GB_macrofy_apply.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_apply.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_apply // construct all macros for GrB_apply ( @@ -178,6 +178,6 @@ void GB_macrofy_apply // construct all macros for GrB_apply // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_apply_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_apply_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_assign.c b/GraphBLAS/Source/jitifyer/GB_macrofy_assign.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_assign.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_assign.c index 4517fa023c..2ab7ebae83 100644 --- a/GraphBLAS/Source/GB_macrofy_assign.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_assign.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_assign // construct all macros for GrB_assign ( @@ -375,6 +375,6 @@ void GB_macrofy_assign // construct all macros for GrB_assign // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_assign_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_assign_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_binop.c b/GraphBLAS/Source/jitifyer/GB_macrofy_binop.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_binop.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_binop.c index 08cb51d91a..abaa771106 100644 --- a/GraphBLAS/Source/GB_macrofy_binop.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_binop.c @@ -8,8 +8,8 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_math.h" -#include "GB_stringify.h" +#include "math/GB_math.h" +#include "jitifyer/GB_stringify.h" #include void GB_macrofy_binop diff --git a/GraphBLAS/Source/GB_macrofy_build.c b/GraphBLAS/Source/jitifyer/GB_macrofy_build.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_build.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_build.c index 2f3b481283..2747843de5 100644 --- a/GraphBLAS/Source/GB_macrofy_build.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_build.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_build // construct all macros for GB_build ( @@ -208,6 +208,6 @@ void GB_macrofy_build // construct all macros for GB_build // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_kernel_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_kernel_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_bytes.c b/GraphBLAS/Source/jitifyer/GB_macrofy_bytes.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_bytes.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_bytes.c index 608f95510e..fb377e5e6d 100644 --- a/GraphBLAS/Source/GB_macrofy_bytes.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_bytes.c @@ -10,7 +10,7 @@ // When the macro is used, sizeof (ztype) must be the same as nbytes. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_bytes ( diff --git a/GraphBLAS/Source/GB_macrofy_cast_copy.c b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_copy.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_cast_copy.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_cast_copy.c index def9890b0a..9ac2bbe845 100644 --- a/GraphBLAS/Source/GB_macrofy_cast_copy.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_copy.c @@ -16,7 +16,7 @@ // an empty macro is created. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_cast_copy ( diff --git a/GraphBLAS/Source/GB_macrofy_cast_expression.c b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_expression.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_cast_expression.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_cast_expression.c index 001f26c9cf..af5164f856 100644 --- a/GraphBLAS/Source/GB_macrofy_cast_expression.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_expression.c @@ -10,8 +10,8 @@ // Return a typecast expression to cast from xtype to ztype. #include "GB.h" -#include "GB_math.h" -#include "GB_stringify.h" +#include "math/GB_math.h" +#include "jitifyer/GB_stringify.h" const char *GB_macrofy_cast_expression // return cast expression ( diff --git a/GraphBLAS/Source/GB_macrofy_cast_input.c b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_input.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_cast_input.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_cast_input.c index a7c8f9981d..c78b73fdb4 100644 --- a/GraphBLAS/Source/GB_macrofy_cast_input.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_input.c @@ -39,7 +39,7 @@ // This method is very similar to GB_macrofy_cast_output. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_cast_input ( diff --git a/GraphBLAS/Source/GB_macrofy_cast_output.c b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_output.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_cast_output.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_cast_output.c index 68990080c7..a8d36b6000 100644 --- a/GraphBLAS/Source/GB_macrofy_cast_output.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_cast_output.c @@ -20,7 +20,7 @@ // This method is very similar to GB_macrofy_cast_input. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_cast_output ( diff --git a/GraphBLAS/Source/GB_macrofy_defn.c b/GraphBLAS/Source/jitifyer/GB_macrofy_defn.c similarity index 97% rename from GraphBLAS/Source/GB_macrofy_defn.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_defn.c index 6df20096c7..f246ee1cf6 100644 --- a/GraphBLAS/Source/GB_macrofy_defn.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_defn.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_defn // construct a defn for an operator ( diff --git a/GraphBLAS/Source/GB_macrofy_ewise.c b/GraphBLAS/Source/jitifyer/GB_macrofy_ewise.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_ewise.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_ewise.c index 95168262a5..a9fbd072a1 100644 --- a/GraphBLAS/Source/GB_macrofy_ewise.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_ewise.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_ewise // construct all macros for GrB_eWise ( @@ -208,6 +208,6 @@ void GB_macrofy_ewise // construct all macros for GrB_eWise // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_ewise_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_ewise_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_family.c b/GraphBLAS/Source/jitifyer/GB_macrofy_family.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_family.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_family.c index f3ec25dcb9..50631bffc3 100644 --- a/GraphBLAS/Source/GB_macrofy_family.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_family.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_family ( diff --git a/GraphBLAS/Source/GB_macrofy_id.c b/GraphBLAS/Source/jitifyer/GB_macrofy_id.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_id.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_id.c index d03250eacd..fc8520dc36 100644 --- a/GraphBLAS/Source/GB_macrofy_id.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_id.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" const char *GB_macrofy_id // return string encoding the value ( diff --git a/GraphBLAS/Source/GB_macrofy_input.c b/GraphBLAS/Source/jitifyer/GB_macrofy_input.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_input.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_input.c index c5fef02899..45679089f9 100644 --- a/GraphBLAS/Source/GB_macrofy_input.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_input.c @@ -10,7 +10,7 @@ // The macro, typically called GB_GETA or GB_GETB, also does typecasting. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_input ( diff --git a/GraphBLAS/Source/GB_macrofy_mask.c b/GraphBLAS/Source/jitifyer/GB_macrofy_mask.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_mask.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_mask.c index 1011275485..563cc6bfe0 100644 --- a/GraphBLAS/Source/GB_macrofy_mask.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_mask.c @@ -11,7 +11,7 @@ // as structural masks. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_mask ( diff --git a/GraphBLAS/Source/GB_macrofy_monoid.c b/GraphBLAS/Source/jitifyer/GB_macrofy_monoid.c similarity index 97% rename from GraphBLAS/Source/GB_macrofy_monoid.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_monoid.c index a4fe05120b..d4716c1c04 100644 --- a/GraphBLAS/Source/GB_macrofy_monoid.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_monoid.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_monoid // construct the macros for a monoid ( @@ -164,9 +164,9 @@ void GB_macrofy_monoid // construct the macros for a monoid // determine the OpenMP #pragma omp reduction(redop:z) for this monoid //-------------------------------------------------------------------------- - // If not #define'd, the default in GB_monoid_shared_definitions.h is no - // #pragma. The pragma is empty if the monoid is terminal, since the simd - // reduction does not work with a 'break' in the loop. + // If not #define'd, omp/include/GB_monoid_shared_definitions.h defaults + // to no #pragma. The pragma is empty if the monoid is terminal, since + // the simd reduction does not work with a 'break' in the loop. bool is_complex = (zcode == GB_FC32_code || zcode == GB_FC64_code) ; @@ -253,7 +253,7 @@ void GB_macrofy_monoid // construct the macros for a monoid if (ztype_ignore_overflow && !is_any_monoid) { // if the monoid is ANY, this is set to 1 by - // GB_monoid_shared_definitions.h, so skip it here + // monoid/include/GB_monoid_shared_definitions.h, so skip it here fprintf (fp, "#define GB_Z_IGNORE_OVERFLOW 1\n") ; } @@ -302,7 +302,9 @@ void GB_macrofy_monoid // construct the macros for a monoid } // atomic write for the ztype: if GB_Z_ATOMIC_BITS is defined, then - // GB_Z_HAS_ATOMIC_WRITE is #defined as 1 by GB_kernel_shared_definitions.h + // GB_Z_HAS_ATOMIC_WRITE is #defined as 1 by + // omp/include/GB_kernel_shared_definitions.h + if (has_atomic_write && (zcode == GB_FC32_code || zcode == GB_UDT_code)) { // user-defined types of size 1, 2, 4, or 8 bytes can be written diff --git a/GraphBLAS/Source/GB_macrofy_multadd.c b/GraphBLAS/Source/jitifyer/GB_macrofy_multadd.c similarity index 97% rename from GraphBLAS/Source/GB_macrofy_multadd.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_multadd.c index f739b65752..bb7549c1ed 100644 --- a/GraphBLAS/Source/GB_macrofy_multadd.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_multadd.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_multadd ( diff --git a/GraphBLAS/Source/GB_macrofy_mxm.c b/GraphBLAS/Source/jitifyer/GB_macrofy_mxm.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_mxm.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_mxm.c index 34dadf959f..eaca02cfa3 100644 --- a/GraphBLAS/Source/GB_macrofy_mxm.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_mxm.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" //------------------------------------------------------------------------------ // GB_macrofy_mxm: create all macros for GrB_mxm @@ -374,6 +374,6 @@ void GB_macrofy_mxm // construct all macros for GrB_mxm // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_mxm_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_mxm_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_name.c b/GraphBLAS/Source/jitifyer/GB_macrofy_name.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_name.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_name.c index 44e806d8af..beb03963e0 100644 --- a/GraphBLAS/Source/GB_macrofy_name.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_name.c @@ -22,7 +22,7 @@ // The suffix is used only for user-defined types and operators. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_name ( diff --git a/GraphBLAS/Source/GB_macrofy_nvals.c b/GraphBLAS/Source/jitifyer/GB_macrofy_nvals.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_nvals.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_nvals.c index ba1494690c..638e3dc44d 100644 --- a/GraphBLAS/Source/GB_macrofy_nvals.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_nvals.c @@ -14,7 +14,7 @@ // e = GB_nnz_held (A) #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_nvals ( diff --git a/GraphBLAS/Source/GB_macrofy_output.c b/GraphBLAS/Source/jitifyer/GB_macrofy_output.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_output.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_output.c index e495a79c16..71f60b7d6b 100644 --- a/GraphBLAS/Source/GB_macrofy_output.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_output.c @@ -11,7 +11,7 @@ // type of the monoid or operator, into the type of the C matrix. #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_output ( diff --git a/GraphBLAS/Source/GB_macrofy_preface.c b/GraphBLAS/Source/jitifyer/GB_macrofy_preface.c similarity index 95% rename from GraphBLAS/Source/GB_macrofy_preface.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_preface.c index 25363e5b75..491edd038c 100644 --- a/GraphBLAS/Source/GB_macrofy_preface.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_preface.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_preface ( @@ -53,6 +53,6 @@ void GB_macrofy_preface } // for all kernels: CPU and CUDA - fprintf (fp, "#include \"GB_jit_kernel.h\"\n\n") ; + fprintf (fp, "#include \"include/GB_jit_kernel.h\"\n\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_query.c b/GraphBLAS/Source/jitifyer/GB_macrofy_query.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_query.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_query.c index c6ed31bbe8..8b56d1fea4 100644 --- a/GraphBLAS/Source/GB_macrofy_query.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_query.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_query ( diff --git a/GraphBLAS/Source/GB_macrofy_reduce.c b/GraphBLAS/Source/jitifyer/GB_macrofy_reduce.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_reduce.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_reduce.c index 3ca25ac043..8a06120521 100644 --- a/GraphBLAS/Source/GB_macrofy_reduce.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_reduce.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_reduce // construct all macros for GrB_reduce to scalar ( @@ -181,6 +181,6 @@ void GB_macrofy_reduce // construct all macros for GrB_reduce to scalar // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_monoid_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_monoid_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_select.c b/GraphBLAS/Source/jitifyer/GB_macrofy_select.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_select.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_select.c index 7cb53bc2c8..6e406bf020 100644 --- a/GraphBLAS/Source/GB_macrofy_select.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_select.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_select // construct all macros for GrB_select ( @@ -229,6 +229,6 @@ void GB_macrofy_select // construct all macros for GrB_select // include the final default definitions //-------------------------------------------------------------------------- - fprintf (fp, "\n#include \"GB_select_shared_definitions.h\"\n") ; + fprintf (fp, "\n#include \"include/GB_select_shared_definitions.h\"\n") ; } diff --git a/GraphBLAS/Source/GB_macrofy_sparsity.c b/GraphBLAS/Source/jitifyer/GB_macrofy_sparsity.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_sparsity.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_sparsity.c index d8e5698491..27381562be 100644 --- a/GraphBLAS/Source/GB_macrofy_sparsity.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_sparsity.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_sparsity // construct macros for sparsity structure ( diff --git a/GraphBLAS/Source/GB_macrofy_string.c b/GraphBLAS/Source/jitifyer/GB_macrofy_string.c similarity index 97% rename from GraphBLAS/Source/GB_macrofy_string.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_string.c index 6d2c96eada..a3ac62725f 100644 --- a/GraphBLAS/Source/GB_macrofy_string.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_string.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_string ( diff --git a/GraphBLAS/Source/GB_macrofy_type.c b/GraphBLAS/Source/jitifyer/GB_macrofy_type.c similarity index 96% rename from GraphBLAS/Source/GB_macrofy_type.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_type.c index 333db2ded2..934096e859 100644 --- a/GraphBLAS/Source/GB_macrofy_type.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_type.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_type ( diff --git a/GraphBLAS/Source/GB_macrofy_typedefs.c b/GraphBLAS/Source/jitifyer/GB_macrofy_typedefs.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_typedefs.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_typedefs.c index 757824456c..a20b02df01 100644 --- a/GraphBLAS/Source/GB_macrofy_typedefs.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_typedefs.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_typedefs ( diff --git a/GraphBLAS/Source/GB_macrofy_unop.c b/GraphBLAS/Source/jitifyer/GB_macrofy_unop.c similarity index 99% rename from GraphBLAS/Source/GB_macrofy_unop.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_unop.c index 2c8658c627..6d1909264e 100644 --- a/GraphBLAS/Source/GB_macrofy_unop.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_unop.c @@ -16,8 +16,8 @@ // #define GB_UNARYOP(z,x,j,i,y) z = f (x,i,j,y) #include "GB.h" -#include "GB_math.h" -#include "GB_stringify.h" +#include "math/GB_math.h" +#include "jitifyer/GB_stringify.h" #include void GB_macrofy_unop diff --git a/GraphBLAS/Source/GB_macrofy_user_op.c b/GraphBLAS/Source/jitifyer/GB_macrofy_user_op.c similarity index 98% rename from GraphBLAS/Source/GB_macrofy_user_op.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_user_op.c index b3038e0b8f..83960ff41d 100644 --- a/GraphBLAS/Source/GB_macrofy_user_op.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_user_op.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_user_op // construct a user-defined operator ( diff --git a/GraphBLAS/Source/GB_macrofy_user_type.c b/GraphBLAS/Source/jitifyer/GB_macrofy_user_type.c similarity index 97% rename from GraphBLAS/Source/GB_macrofy_user_type.c rename to GraphBLAS/Source/jitifyer/GB_macrofy_user_type.c index 0b85282c71..f117ef7f38 100644 --- a/GraphBLAS/Source/GB_macrofy_user_type.c +++ b/GraphBLAS/Source/jitifyer/GB_macrofy_user_type.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" void GB_macrofy_user_type // construct a user-defined type ( diff --git a/GraphBLAS/Source/GB_stringify.h b/GraphBLAS/Source/jitifyer/GB_stringify.h similarity index 99% rename from GraphBLAS/Source/GB_stringify.h rename to GraphBLAS/Source/jitifyer/GB_stringify.h index 630fcac01b..4835afb534 100644 --- a/GraphBLAS/Source/GB_stringify.h +++ b/GraphBLAS/Source/jitifyer/GB_stringify.h @@ -10,9 +10,9 @@ #ifndef GB_STRINGIFY_H #define GB_STRINGIFY_H -#include "GB_binop.h" -#include "GB_jitifyer.h" -#include "GB_callback.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_jitifyer.h" +#include "callback/include/GB_callback.h" //------------------------------------------------------------------------------ // print kernel preface diff --git a/GraphBLAS/Source/GB_kron.c b/GraphBLAS/Source/kronecker/GB_kron.c similarity index 98% rename from GraphBLAS/Source/GB_kron.c rename to GraphBLAS/Source/kronecker/GB_kron.c index 7eca5c82a9..6085bd6685 100644 --- a/GraphBLAS/Source/GB_kron.c +++ b/GraphBLAS/Source/kronecker/GB_kron.c @@ -23,10 +23,10 @@ GB_Matrix_free (&T) ; \ } -#include "GB_kron.h" -#include "GB_mxm.h" -#include "GB_transpose.h" -#include "GB_accum_mask.h" +#include "kronecker/GB_kron.h" +#include "mxm/GB_mxm.h" +#include "transpose/GB_transpose.h" +#include "mask/GB_accum_mask.h" GrB_Info GB_kron // C = accum (C, kron(A,B)) ( diff --git a/GraphBLAS/Source/GB_kron.h b/GraphBLAS/Source/kronecker/GB_kron.h similarity index 100% rename from GraphBLAS/Source/GB_kron.h rename to GraphBLAS/Source/kronecker/GB_kron.h diff --git a/GraphBLAS/Source/GB_kroner.c b/GraphBLAS/Source/kronecker/GB_kroner.c similarity index 99% rename from GraphBLAS/Source/GB_kroner.c rename to GraphBLAS/Source/kronecker/GB_kroner.c index 4301a1193c..5efb61662a 100644 --- a/GraphBLAS/Source/GB_kroner.c +++ b/GraphBLAS/Source/kronecker/GB_kroner.c @@ -36,8 +36,8 @@ GB_phybix_free (C) ; \ } -#include "GB_kron.h" -#include "GB_emult.h" +#include "kronecker/GB_kron.h" +#include "ewise/GB_emult.h" GrB_Info GB_kroner // C = kron (A,B) ( diff --git a/GraphBLAS/Source/GrB_kronecker.c b/GraphBLAS/Source/kronecker/GrB_kronecker.c similarity index 99% rename from GraphBLAS/Source/GrB_kronecker.c rename to GraphBLAS/Source/kronecker/GrB_kronecker.c index 6746c3c110..1fb668abfa 100644 --- a/GraphBLAS/Source/GrB_kronecker.c +++ b/GraphBLAS/Source/kronecker/GrB_kronecker.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_kron.h" -#include "GB_get_mask.h" +#include "kronecker/GB_kron.h" +#include "mask/GB_get_mask.h" //------------------------------------------------------------------------------ // GrB_Matrix_kronecker_BinaryOp: Kronecker product with binary operator diff --git a/GraphBLAS/Source/GB_lz4.c b/GraphBLAS/Source/lz4_wrapper/GB_lz4.c similarity index 95% rename from GraphBLAS/Source/GB_lz4.c rename to GraphBLAS/Source/lz4_wrapper/GB_lz4.c index 17802a4018..44d40c9107 100644 --- a/GraphBLAS/Source/GB_lz4.c +++ b/GraphBLAS/Source/lz4_wrapper/GB_lz4.c @@ -13,8 +13,8 @@ // in place of malloc/calloc/free. #include "GB.h" -#include "GB_serialize.h" -#include "GB_lz4.h" +#include "serialize/GB_serialize.h" +#include "lz4_wrapper/GB_lz4.h" void *LZ4_malloc (size_t s) { diff --git a/GraphBLAS/Source/GB_lz4.h b/GraphBLAS/Source/lz4_wrapper/GB_lz4.h similarity index 100% rename from GraphBLAS/Source/GB_lz4.h rename to GraphBLAS/Source/lz4_wrapper/GB_lz4.h diff --git a/GraphBLAS/Source/GB_accum_mask.c b/GraphBLAS/Source/mask/GB_accum_mask.c similarity index 98% rename from GraphBLAS/Source/GB_accum_mask.c rename to GraphBLAS/Source/mask/GB_accum_mask.c index 3487fdb778..fa936b1271 100644 --- a/GraphBLAS/Source/GB_accum_mask.c +++ b/GraphBLAS/Source/mask/GB_accum_mask.c @@ -51,13 +51,13 @@ GB_Matrix_free (&Z) ; \ } -#include "GB_subassign.h" -#include "GB_add.h" -#include "GB_mask.h" -#include "GB_transpose.h" -#include "GB_accum_mask.h" -#include "GB_bitmap_assign.h" -#include "GB_unused.h" +#include "assign/GB_subassign.h" +#include "ewise/GB_add.h" +#include "mask/GB_mask.h" +#include "transpose/GB_transpose.h" +#include "mask/GB_accum_mask.h" +#include "assign/GB_bitmap_assign.h" +#include "include/GB_unused.h" /* ----------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/GB_accum_mask.h b/GraphBLAS/Source/mask/GB_accum_mask.h similarity index 100% rename from GraphBLAS/Source/GB_accum_mask.h rename to GraphBLAS/Source/mask/GB_accum_mask.h diff --git a/GraphBLAS/Source/GB_get_mask.h b/GraphBLAS/Source/mask/GB_get_mask.h similarity index 98% rename from GraphBLAS/Source/GB_get_mask.h rename to GraphBLAS/Source/mask/GB_get_mask.h index 9b9037270d..0aefc5d026 100644 --- a/GraphBLAS/Source/GB_get_mask.h +++ b/GraphBLAS/Source/mask/GB_get_mask.h @@ -9,7 +9,7 @@ #ifndef GB_GET_MASK_H #define GB_GET_MASK_H -#include "GB_is_nonzero.h" +#include "iso/GB_is_nonzero.h" static inline GrB_Matrix GB_get_mask // return M_in or NULL ( diff --git a/GraphBLAS/Source/GB_mask.c b/GraphBLAS/Source/mask/GB_mask.c similarity index 99% rename from GraphBLAS/Source/GB_mask.c rename to GraphBLAS/Source/mask/GB_mask.c index 0ffa3b8bd8..e985b74f52 100644 --- a/GraphBLAS/Source/GB_mask.c +++ b/GraphBLAS/Source/mask/GB_mask.c @@ -114,7 +114,7 @@ GB_Matrix_free (&R) ; \ } -#include "GB_mask.h" +#include "mask/GB_mask.h" //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_mask.h b/GraphBLAS/Source/mask/GB_mask.h similarity index 99% rename from GraphBLAS/Source/GB_mask.h rename to GraphBLAS/Source/mask/GB_mask.h index 5033419bb3..44dfee5c17 100644 --- a/GraphBLAS/Source/GB_mask.h +++ b/GraphBLAS/Source/mask/GB_mask.h @@ -10,7 +10,7 @@ #ifndef GB_MASK_H #define GB_MASK_H #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB_mask // C = Z ( diff --git a/GraphBLAS/Source/GB_mask_very_sparse.h b/GraphBLAS/Source/mask/GB_mask_very_sparse.h similarity index 100% rename from GraphBLAS/Source/GB_mask_very_sparse.h rename to GraphBLAS/Source/mask/GB_mask_very_sparse.h diff --git a/GraphBLAS/Source/GB_masker.c b/GraphBLAS/Source/mask/GB_masker.c similarity index 99% rename from GraphBLAS/Source/GB_masker.c rename to GraphBLAS/Source/mask/GB_masker.c index c3fd851a2a..aa8a3b0342 100644 --- a/GraphBLAS/Source/GB_masker.c +++ b/GraphBLAS/Source/mask/GB_masker.c @@ -49,8 +49,8 @@ // R is iso if both C and Z are iso and zij == cij. This is handled in // GB_masker_phase2. -#include "GB_mask.h" -#include "GB_add.h" +#include "mask/GB_mask.h" +#include "ewise/GB_add.h" #define GB_FREE_ALL ; GrB_Info GB_masker // R = masker (C, M, Z) diff --git a/GraphBLAS/Source/GB_masker_phase1.c b/GraphBLAS/Source/mask/GB_masker_phase1.c similarity index 97% rename from GraphBLAS/Source/GB_masker_phase1.c rename to GraphBLAS/Source/mask/GB_masker_phase1.c index 47a66d41dd..33c89f3e94 100644 --- a/GraphBLAS/Source/GB_masker_phase1.c +++ b/GraphBLAS/Source/mask/GB_masker_phase1.c @@ -21,8 +21,8 @@ // Rp is either freed by phase2, or transplanted into R. -#include "GB_mask.h" -#include "GB_unused.h" +#include "mask/GB_mask.h" +#include "include/GB_unused.h" GrB_Info GB_masker_phase1 // count nnz in each R(:,j) ( @@ -97,7 +97,7 @@ GrB_Info GB_masker_phase1 // count nnz in each R(:,j) //-------------------------------------------------------------------------- #define GB_PHASE_1_OF_2 - #include "GB_masker_template.c" + #include "mask/factory/GB_masker_template.c" //-------------------------------------------------------------------------- // cumulative sum of Rp and fine tasks in TaskList diff --git a/GraphBLAS/Source/GB_masker_phase2.c b/GraphBLAS/Source/mask/GB_masker_phase2.c similarity index 97% rename from GraphBLAS/Source/GB_masker_phase2.c rename to GraphBLAS/Source/mask/GB_masker_phase2.c index 72597bcd55..96db52d20b 100644 --- a/GraphBLAS/Source/GB_masker_phase2.c +++ b/GraphBLAS/Source/mask/GB_masker_phase2.c @@ -26,9 +26,9 @@ // R is iso if both C and Z are iso and zij == cij. -#include "GB_mask.h" -#include "GB_ek_slice.h" -#include "GB_unused.h" +#include "mask/GB_mask.h" +#include "slice/GB_ek_slice.h" +#include "include/GB_unused.h" #undef GB_FREE_WORKSPACE #define GB_FREE_WORKSPACE \ @@ -196,11 +196,11 @@ GrB_Info GB_masker_phase2 // phase2 for R = masker (C,M,Z) // C must be iso; copy its iso value into R memcpy (R->x, C->x, czsize) ; } - #include "GB_masker_template.c" + #include "mask/factory/GB_masker_template.c" } else { - #include "GB_masker_template.c" + #include "mask/factory/GB_masker_template.c" } //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/GB_masker_sparsity.c b/GraphBLAS/Source/mask/GB_masker_sparsity.c similarity index 99% rename from GraphBLAS/Source/GB_masker_sparsity.c rename to GraphBLAS/Source/mask/GB_masker_sparsity.c index 9ede293607..cc67e7e109 100644 --- a/GraphBLAS/Source/GB_masker_sparsity.c +++ b/GraphBLAS/Source/mask/GB_masker_sparsity.c @@ -16,7 +16,7 @@ // case is handled by GB_subassign instead. R can be constructed as sparse, // hypersparse, or bitmap (not full). M and Z can have any sparsity pattern. -#include "GB_mask.h" +#include "mask/GB_mask.h" int GB_masker_sparsity // return the sparsity structure for R ( diff --git a/GraphBLAS/Source/Factories/GB_bitmap_masker_template.c b/GraphBLAS/Source/mask/factory/GB_bitmap_masker_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_bitmap_masker_template.c rename to GraphBLAS/Source/mask/factory/GB_bitmap_masker_template.c diff --git a/GraphBLAS/Source/Factories/GB_masker_template.c b/GraphBLAS/Source/mask/factory/GB_masker_template.c similarity index 95% rename from GraphBLAS/Source/Factories/GB_masker_template.c rename to GraphBLAS/Source/mask/factory/GB_masker_template.c index 07767a6733..6dd31a4769 100644 --- a/GraphBLAS/Source/Factories/GB_masker_template.c +++ b/GraphBLAS/Source/mask/factory/GB_masker_template.c @@ -97,7 +97,7 @@ #if defined ( GB_PHASE_1_OF_2 ) { // phase1 - #include "GB_sparse_masker_template.c" + #include "mask/factory/GB_sparse_masker_template.c" } #else { @@ -105,13 +105,13 @@ if (R_sparsity == GxB_SPARSE || R_sparsity == GxB_HYPERSPARSE) { // R is sparse or hypersparse (phase1 and phase2) - #include "GB_sparse_masker_template.c" + #include "mask/factory/GB_sparse_masker_template.c" } else // R_sparsity == GxB_BITMAP { // R is bitmap (phase2 only) ASSERT (R_sparsity == GxB_BITMAP) ; - #include "GB_bitmap_masker_template.c" + #include "mask/factory/GB_bitmap_masker_template.c" } } #endif diff --git a/GraphBLAS/Source/Factories/GB_sparse_masker_template.c b/GraphBLAS/Source/mask/factory/GB_sparse_masker_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_sparse_masker_template.c rename to GraphBLAS/Source/mask/factory/GB_sparse_masker_template.c diff --git a/GraphBLAS/Source/GB_bitwise.c b/GraphBLAS/Source/math/GB_bitwise.c similarity index 100% rename from GraphBLAS/Source/GB_bitwise.c rename to GraphBLAS/Source/math/GB_bitwise.c diff --git a/GraphBLAS/Source/GB_bitwise.h b/GraphBLAS/Source/math/GB_bitwise.h similarity index 100% rename from GraphBLAS/Source/GB_bitwise.h rename to GraphBLAS/Source/math/GB_bitwise.h diff --git a/GraphBLAS/Source/GB_int64_multiply.h b/GraphBLAS/Source/math/GB_int64_multiply.h similarity index 100% rename from GraphBLAS/Source/GB_int64_multiply.h rename to GraphBLAS/Source/math/GB_int64_multiply.h diff --git a/GraphBLAS/Source/GB_math.c b/GraphBLAS/Source/math/GB_math.c similarity index 97% rename from GraphBLAS/Source/GB_math.c rename to GraphBLAS/Source/math/GB_math.c index c34f57ee11..189ad68540 100644 --- a/GraphBLAS/Source/GB_math.c +++ b/GraphBLAS/Source/math/GB_math.c @@ -8,11 +8,11 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" #if !GB_HAS_CMPLX_MACROS // complex constructors when the C compiler does not provide CMPLX and CMPLXF -// macros. See Source/Shared/GB_complex.h +// macros. See Source/math/include/GB_complex.h extern GxB_FC32_t GB_complexf (float xreal, float ximag) ; extern GxB_FC64_t GB_complex (double xreal, double ximag) ; #endif diff --git a/GraphBLAS/Source/GB_math.h b/GraphBLAS/Source/math/GB_math.h similarity index 99% rename from GraphBLAS/Source/GB_math.h rename to GraphBLAS/Source/math/GB_math.h index 756a392784..a743a9fc6f 100644 --- a/GraphBLAS/Source/GB_math.h +++ b/GraphBLAS/Source/math/GB_math.h @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_casting.h" +#include "cast/GB_casting.h" #ifndef GB_MATH_H #define GB_MATH_H diff --git a/GraphBLAS/Source/GB_size_t_multiply.h b/GraphBLAS/Source/math/GB_size_t_multiply.h similarity index 100% rename from GraphBLAS/Source/GB_size_t_multiply.h rename to GraphBLAS/Source/math/GB_size_t_multiply.h diff --git a/GraphBLAS/Source/GB_uint64_multiply.h b/GraphBLAS/Source/math/GB_uint64_multiply.h similarity index 100% rename from GraphBLAS/Source/GB_uint64_multiply.h rename to GraphBLAS/Source/math/GB_uint64_multiply.h diff --git a/GraphBLAS/Source/Template/GB_binary_search.h b/GraphBLAS/Source/math/include/GB_binary_search.h similarity index 83% rename from GraphBLAS/Source/Template/GB_binary_search.h rename to GraphBLAS/Source/math/include/GB_binary_search.h index 4e40777ce1..4634363b99 100644 --- a/GraphBLAS/Source/Template/GB_binary_search.h +++ b/GraphBLAS/Source/math/include/GB_binary_search.h @@ -18,27 +18,50 @@ // The list X [pleft ... pright] is in ascending order. It may have // duplicates. -#define GB_TRIM_BINARY_SEARCH(i,X,pleft,pright) \ -{ \ - /* binary search of X [pleft ... pright] for integer i */ \ - while (pleft < pright) \ +#ifdef GB_CUDA_KERNEL + + // binary search on the GPU, with fewer branches + #define GB_TRIM_BINARY_SEARCH(i,X,pleft,pright) \ { \ - int64_t pmiddle = (pleft + pright) / 2 ; \ - if (X [pmiddle] < i) \ + /* binary search of X [pleft ... pright] for integer i */ \ + while (pleft < pright) \ { \ - /* if in the list, it appears in [pmiddle+1..pright] */ \ - pleft = pmiddle + 1 ; \ + int64_t pmiddle = (pleft + pright) >> 1 ; \ + bool less = (X [pmiddle] < i) ; \ + pleft = less ? (pmiddle+1) : pleft ; \ + pright = less ? pright : pmiddle ; \ } \ - else \ + /* binary search is narrowed down to a single item */ \ + /* or it has found the list is empty */ \ + /* ASSERT (pleft == pright || pleft == pright + 1) ; */ \ + } + +#else + + // binary search on the CPU + #define GB_TRIM_BINARY_SEARCH(i,X,pleft,pright) \ + { \ + /* binary search of X [pleft ... pright] for integer i */ \ + while (pleft < pright) \ { \ - /* if in the list, it appears in [pleft..pmiddle] */ \ - pright = pmiddle ; \ + int64_t pmiddle = (pleft + pright) / 2 ; \ + if (X [pmiddle] < i) \ + { \ + /* if in the list, it appears in [pmiddle+1..pright] */ \ + pleft = pmiddle + 1 ; \ + } \ + else \ + { \ + /* if in the list, it appears in [pleft..pmiddle] */ \ + pright = pmiddle ; \ + } \ } \ - } \ - /* binary search is narrowed down to a single item */ \ - /* or it has found the list is empty */ \ - ASSERT (pleft == pright || pleft == pright + 1) ; \ -} + /* binary search is narrowed down to a single item */ \ + /* or it has found the list is empty */ \ + /* ASSERT (pleft == pright || pleft == pright + 1) ; */ \ + } + +#endif //------------------------------------------------------------------------------ // GB_BINARY_SEARCH: binary search and check if found @@ -107,7 +130,7 @@ } \ /* binary search is narrowed down to a single item */ \ /* or it has found the list is empty */ \ - ASSERT (pleft == pright || pleft == pright + 1) ; \ + /* ASSERT (pleft == pright || pleft == pright + 1) ; */ \ } //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Shared/GB_complex.h b/GraphBLAS/Source/math/include/GB_complex.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_complex.h rename to GraphBLAS/Source/math/include/GB_complex.h diff --git a/GraphBLAS/Source/Shared/GB_hash.h b/GraphBLAS/Source/math/include/GB_hash.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_hash.h rename to GraphBLAS/Source/math/include/GB_hash.h diff --git a/GraphBLAS/Source/Template/GB_iceil.h b/GraphBLAS/Source/math/include/GB_iceil.h similarity index 100% rename from GraphBLAS/Source/Template/GB_iceil.h rename to GraphBLAS/Source/math/include/GB_iceil.h diff --git a/GraphBLAS/Source/Shared/GB_int64_mult.h b/GraphBLAS/Source/math/include/GB_int64_mult.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_int64_mult.h rename to GraphBLAS/Source/math/include/GB_int64_mult.h diff --git a/GraphBLAS/Source/Template/GB_log2.h b/GraphBLAS/Source/math/include/GB_log2.h similarity index 100% rename from GraphBLAS/Source/Template/GB_log2.h rename to GraphBLAS/Source/math/include/GB_log2.h diff --git a/GraphBLAS/Source/Template/GB_math_macros.h b/GraphBLAS/Source/math/include/GB_math_macros.h similarity index 96% rename from GraphBLAS/Source/Template/GB_math_macros.h rename to GraphBLAS/Source/math/include/GB_math_macros.h index b694c45f9f..afd2d9b6b1 100644 --- a/GraphBLAS/Source/Template/GB_math_macros.h +++ b/GraphBLAS/Source/math/include/GB_math_macros.h @@ -37,8 +37,5 @@ #define GB_IMAX(x,y) (((x) > (y)) ? (x) : (y)) #define GB_IMIN(x,y) (((x) < (y)) ? (x) : (y)) -// ceiling of a/b for two integers a and b -#include "GB_iceil.h" - #endif diff --git a/GraphBLAS/Source/Template/GB_zombie.h b/GraphBLAS/Source/math/include/GB_zombie.h similarity index 100% rename from GraphBLAS/Source/Template/GB_zombie.h rename to GraphBLAS/Source/math/include/GB_zombie.h diff --git a/GraphBLAS/Source/Shared/GxB_complex.h b/GraphBLAS/Source/math/include/GxB_complex.h similarity index 88% rename from GraphBLAS/Source/Shared/GxB_complex.h rename to GraphBLAS/Source/math/include/GxB_complex.h index 5da5f60532..0767ab0aaa 100644 --- a/GraphBLAS/Source/Shared/GxB_complex.h +++ b/GraphBLAS/Source/math/include/GxB_complex.h @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GxB_complex.h: definitions for the GraphBLAS complex types +// GxB_complex.h: definitions for the GraphBLAS complex types (no longer needed) //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. diff --git a/GraphBLAS/Source/GB_Matrix_free.c b/GraphBLAS/Source/matrix/GB_Matrix_free.c similarity index 100% rename from GraphBLAS/Source/GB_Matrix_free.c rename to GraphBLAS/Source/matrix/GB_Matrix_free.c diff --git a/GraphBLAS/Source/GB_Matrix_new.c b/GraphBLAS/Source/matrix/GB_Matrix_new.c similarity index 100% rename from GraphBLAS/Source/GB_Matrix_new.c rename to GraphBLAS/Source/matrix/GB_Matrix_new.c diff --git a/GraphBLAS/Source/GB_bix_alloc.c b/GraphBLAS/Source/matrix/GB_bix_alloc.c similarity index 100% rename from GraphBLAS/Source/GB_bix_alloc.c rename to GraphBLAS/Source/matrix/GB_bix_alloc.c diff --git a/GraphBLAS/Source/GB_bix_free.c b/GraphBLAS/Source/matrix/GB_bix_free.c similarity index 98% rename from GraphBLAS/Source/GB_bix_free.c rename to GraphBLAS/Source/matrix/GB_bix_free.c index f07b5173b6..3d56d3fbd2 100644 --- a/GraphBLAS/Source/GB_bix_free.c +++ b/GraphBLAS/Source/matrix/GB_bix_free.c @@ -10,7 +10,7 @@ // Since A->p and A->h are unchanged, the matrix is still valid (unless it was // invalid on input). nnz(A) would report zero, and so would GrB_Matrix_nvals. -#include "GB_Pending.h" +#include "pending/GB_Pending.h" void GB_bix_free // free A->b, A->i, and A->x of a matrix ( diff --git a/GraphBLAS/Source/GB_hyper_hash_free.c b/GraphBLAS/Source/matrix/GB_hyper_hash_free.c similarity index 100% rename from GraphBLAS/Source/GB_hyper_hash_free.c rename to GraphBLAS/Source/matrix/GB_hyper_hash_free.c diff --git a/GraphBLAS/Source/GB_ix_realloc.c b/GraphBLAS/Source/matrix/GB_ix_realloc.c similarity index 100% rename from GraphBLAS/Source/GB_ix_realloc.c rename to GraphBLAS/Source/matrix/GB_ix_realloc.c diff --git a/GraphBLAS/Source/GB_new.c b/GraphBLAS/Source/matrix/GB_new.c similarity index 100% rename from GraphBLAS/Source/GB_new.c rename to GraphBLAS/Source/matrix/GB_new.c diff --git a/GraphBLAS/Source/GB_new.h b/GraphBLAS/Source/matrix/GB_new.h similarity index 100% rename from GraphBLAS/Source/GB_new.h rename to GraphBLAS/Source/matrix/GB_new.h diff --git a/GraphBLAS/Source/GB_new_bix.c b/GraphBLAS/Source/matrix/GB_new_bix.c similarity index 100% rename from GraphBLAS/Source/GB_new_bix.c rename to GraphBLAS/Source/matrix/GB_new_bix.c diff --git a/GraphBLAS/Source/GB_phy_free.c b/GraphBLAS/Source/matrix/GB_phy_free.c similarity index 100% rename from GraphBLAS/Source/GB_phy_free.c rename to GraphBLAS/Source/matrix/GB_phy_free.c diff --git a/GraphBLAS/Source/GB_phybix_free.c b/GraphBLAS/Source/matrix/GB_phybix_free.c similarity index 100% rename from GraphBLAS/Source/GB_phybix_free.c rename to GraphBLAS/Source/matrix/GB_phybix_free.c diff --git a/GraphBLAS/Source/GB_shallow_copy.c b/GraphBLAS/Source/matrix/GB_shallow_copy.c similarity index 98% rename from GraphBLAS/Source/GB_shallow_copy.c rename to GraphBLAS/Source/matrix/GB_shallow_copy.c index cef3d78ce7..455bdf2479 100644 --- a/GraphBLAS/Source/GB_shallow_copy.c +++ b/GraphBLAS/Source/matrix/GB_shallow_copy.c @@ -21,8 +21,8 @@ // Compare this function with GB_shallow_op.c. -#include "GB_transpose.h" -#include "GB_unused.h" +#include "transpose/GB_transpose.h" +#include "include/GB_unused.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GB_static_header.h b/GraphBLAS/Source/matrix/GB_static_header.h similarity index 100% rename from GraphBLAS/Source/GB_static_header.h rename to GraphBLAS/Source/matrix/GB_static_header.h diff --git a/GraphBLAS/Source/GrB_Matrix_free.c b/GraphBLAS/Source/matrix/GrB_Matrix_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_free.c rename to GraphBLAS/Source/matrix/GrB_Matrix_free.c diff --git a/GraphBLAS/Source/GrB_Matrix_ncols.c b/GraphBLAS/Source/matrix/GrB_Matrix_ncols.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_ncols.c rename to GraphBLAS/Source/matrix/GrB_Matrix_ncols.c diff --git a/GraphBLAS/Source/GrB_Matrix_new.c b/GraphBLAS/Source/matrix/GrB_Matrix_new.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_new.c rename to GraphBLAS/Source/matrix/GrB_Matrix_new.c diff --git a/GraphBLAS/Source/GrB_Matrix_nrows.c b/GraphBLAS/Source/matrix/GrB_Matrix_nrows.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_nrows.c rename to GraphBLAS/Source/matrix/GrB_Matrix_nrows.c diff --git a/GraphBLAS/Source/GB_calloc_memory.c b/GraphBLAS/Source/memory/GB_calloc_memory.c similarity index 100% rename from GraphBLAS/Source/GB_calloc_memory.c rename to GraphBLAS/Source/memory/GB_calloc_memory.c diff --git a/GraphBLAS/Source/GB_free_memory.c b/GraphBLAS/Source/memory/GB_free_memory.c similarity index 100% rename from GraphBLAS/Source/GB_free_memory.c rename to GraphBLAS/Source/memory/GB_free_memory.c diff --git a/GraphBLAS/Source/GB_malloc_memory.c b/GraphBLAS/Source/memory/GB_malloc_memory.c similarity index 100% rename from GraphBLAS/Source/GB_malloc_memory.c rename to GraphBLAS/Source/memory/GB_malloc_memory.c diff --git a/GraphBLAS/Source/GB_memcpy.c b/GraphBLAS/Source/memory/GB_memcpy.c similarity index 100% rename from GraphBLAS/Source/GB_memcpy.c rename to GraphBLAS/Source/memory/GB_memcpy.c diff --git a/GraphBLAS/Source/GB_memory.h b/GraphBLAS/Source/memory/GB_memory.h similarity index 100% rename from GraphBLAS/Source/GB_memory.h rename to GraphBLAS/Source/memory/GB_memory.h diff --git a/GraphBLAS/Source/GB_memoryUsage.c b/GraphBLAS/Source/memory/GB_memoryUsage.c similarity index 100% rename from GraphBLAS/Source/GB_memoryUsage.c rename to GraphBLAS/Source/memory/GB_memoryUsage.c diff --git a/GraphBLAS/Source/GB_memset.c b/GraphBLAS/Source/memory/GB_memset.c similarity index 100% rename from GraphBLAS/Source/GB_memset.c rename to GraphBLAS/Source/memory/GB_memset.c diff --git a/GraphBLAS/Source/GB_realloc_memory.c b/GraphBLAS/Source/memory/GB_realloc_memory.c similarity index 100% rename from GraphBLAS/Source/GB_realloc_memory.c rename to GraphBLAS/Source/memory/GB_realloc_memory.c diff --git a/GraphBLAS/Source/GB_xalloc_memory.c b/GraphBLAS/Source/memory/GB_xalloc_memory.c similarity index 100% rename from GraphBLAS/Source/GB_xalloc_memory.c rename to GraphBLAS/Source/memory/GB_xalloc_memory.c diff --git a/GraphBLAS/Source/GxB_Matrix_memoryUsage.c b/GraphBLAS/Source/memory/GxB_Matrix_memoryUsage.c similarity index 100% rename from GraphBLAS/Source/GxB_Matrix_memoryUsage.c rename to GraphBLAS/Source/memory/GxB_Matrix_memoryUsage.c diff --git a/GraphBLAS/Source/GxB_Scalar_memoryUsage.c b/GraphBLAS/Source/memory/GxB_Scalar_memoryUsage.c similarity index 100% rename from GraphBLAS/Source/GxB_Scalar_memoryUsage.c rename to GraphBLAS/Source/memory/GxB_Scalar_memoryUsage.c diff --git a/GraphBLAS/Source/GxB_Vector_memoryUsage.c b/GraphBLAS/Source/memory/GxB_Vector_memoryUsage.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_memoryUsage.c rename to GraphBLAS/Source/memory/GxB_Vector_memoryUsage.c diff --git a/GraphBLAS/Source/Template/GB_memory_macros.h b/GraphBLAS/Source/memory/include/GB_memory_macros.h similarity index 100% rename from GraphBLAS/Source/Template/GB_memory_macros.h rename to GraphBLAS/Source/memory/include/GB_memory_macros.h diff --git a/GraphBLAS/Source/GB_Monoid_new.c b/GraphBLAS/Source/monoid/GB_Monoid_new.c similarity index 99% rename from GraphBLAS/Source/GB_Monoid_new.c rename to GraphBLAS/Source/monoid/GB_Monoid_new.c index 5aec6e0c91..f83ed1a7d7 100644 --- a/GraphBLAS/Source/GB_Monoid_new.c +++ b/GraphBLAS/Source/monoid/GB_Monoid_new.c @@ -19,9 +19,9 @@ // monoid does not have a terminal value. #include "GB.h" -#include "GB_binop.h" -#include "GB_Monoid_new.h" -#include "GB_jitifyer.h" +#include "binaryop/GB_binop.h" +#include "monoid/GB_Monoid_new.h" +#include "jitifyer/GB_jitifyer.h" GrB_Info GB_Monoid_new // create a monoid ( diff --git a/GraphBLAS/Source/GB_Monoid_new.h b/GraphBLAS/Source/monoid/GB_Monoid_new.h similarity index 100% rename from GraphBLAS/Source/GB_Monoid_new.h rename to GraphBLAS/Source/monoid/GB_Monoid_new.h diff --git a/GraphBLAS/Source/GrB_Monoid_free.c b/GraphBLAS/Source/monoid/GrB_Monoid_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Monoid_free.c rename to GraphBLAS/Source/monoid/GrB_Monoid_free.c diff --git a/GraphBLAS/Source/GrB_Monoid_new.c b/GraphBLAS/Source/monoid/GrB_Monoid_new.c similarity index 98% rename from GraphBLAS/Source/GrB_Monoid_new.c rename to GraphBLAS/Source/monoid/GrB_Monoid_new.c index 419a7086ea..eb031ff4c4 100644 --- a/GraphBLAS/Source/GrB_Monoid_new.c +++ b/GraphBLAS/Source/monoid/GrB_Monoid_new.c @@ -12,7 +12,7 @@ // same type. No typecasting is done for the identity value. #include "GB.h" -#include "GB_Monoid_new.h" +#include "monoid/GB_Monoid_new.h" #define GB_MONOID_NEW(prefix,type,T) \ GrB_Info GB_EVAL3 (prefix, _Monoid_new_, T) /* create a new monoid */ \ diff --git a/GraphBLAS/Source/GxB_Monoid_identity.c b/GraphBLAS/Source/monoid/GxB_Monoid_identity.c similarity index 100% rename from GraphBLAS/Source/GxB_Monoid_identity.c rename to GraphBLAS/Source/monoid/GxB_Monoid_identity.c diff --git a/GraphBLAS/Source/GxB_Monoid_operator.c b/GraphBLAS/Source/monoid/GxB_Monoid_operator.c similarity index 100% rename from GraphBLAS/Source/GxB_Monoid_operator.c rename to GraphBLAS/Source/monoid/GxB_Monoid_operator.c diff --git a/GraphBLAS/Source/GxB_Monoid_terminal.c b/GraphBLAS/Source/monoid/GxB_Monoid_terminal.c similarity index 100% rename from GraphBLAS/Source/GxB_Monoid_terminal.c rename to GraphBLAS/Source/monoid/GxB_Monoid_terminal.c diff --git a/GraphBLAS/Source/GxB_Monoid_terminal_new.c b/GraphBLAS/Source/monoid/GxB_Monoid_terminal_new.c similarity index 98% rename from GraphBLAS/Source/GxB_Monoid_terminal_new.c rename to GraphBLAS/Source/monoid/GxB_Monoid_terminal_new.c index 7b768edba8..112c504353 100644 --- a/GraphBLAS/Source/GxB_Monoid_terminal_new.c +++ b/GraphBLAS/Source/monoid/GxB_Monoid_terminal_new.c @@ -12,7 +12,7 @@ // identity value. #include "GB.h" -#include "GB_Monoid_new.h" +#include "monoid/GB_Monoid_new.h" #define GB_MONOID_TERMINAL_NEW(type,T) \ GrB_Info GB_EVAL2 (GXB (Monoid_terminal_new_), T) /* create a new monoid */ \ diff --git a/GraphBLAS/Source/Shared/GB_monoid_shared_definitions.h b/GraphBLAS/Source/monoid/include/GB_monoid_shared_definitions.h similarity index 99% rename from GraphBLAS/Source/Shared/GB_monoid_shared_definitions.h rename to GraphBLAS/Source/monoid/include/GB_monoid_shared_definitions.h index 599ad5a850..2cc223afd7 100644 --- a/GraphBLAS/Source/Shared/GB_monoid_shared_definitions.h +++ b/GraphBLAS/Source/monoid/include/GB_monoid_shared_definitions.h @@ -11,7 +11,7 @@ // if the special cases have not been #define'd prior to #include'ing this // file. -#include "GB_kernel_shared_definitions.h" +#include "include/GB_kernel_shared_definitions.h" #ifndef GB_MONOID_SHARED_DEFINITIONS_H #define GB_MONOID_SHARED_DEFINITIONS_H diff --git a/GraphBLAS/Source/GB_AxB__any_pair_iso.c b/GraphBLAS/Source/mxm/GB_AxB__any_pair_iso.c similarity index 89% rename from GraphBLAS/Source/GB_AxB__any_pair_iso.c rename to GraphBLAS/Source/mxm/GB_AxB__any_pair_iso.c index d542d4e7f9..f478e154e4 100644 --- a/GraphBLAS/Source/GB_AxB__any_pair_iso.c +++ b/GraphBLAS/Source/mxm/GB_AxB__any_pair_iso.c @@ -2,15 +2,17 @@ // GB_AxB__any_pair_iso.c: matrix multiply for a single semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ #include "GB.h" #include "GB_control.h" -#include "GB_AxB_kernels.h" -#include "GB_AxB__include1.h" +#include "mxm/GB_AxB_saxpy.h" +#include "include/GB_unused.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "mxm/GB_AxB__include1.h" // semiring operators: #define GB_MULTADD(z,a,b,i,k,j) @@ -64,7 +66,7 @@ // disable this semiring and use the generic case if these conditions hold #define GB_DISABLE 0 -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" //------------------------------------------------------------------------------ // GB_Adot2B: C=A'*B, C=A'*B, or C=A'*B: dot product method, C is bitmap @@ -85,7 +87,7 @@ GrB_Info GB (_Adot2B__any_pair_iso) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" return (GrB_SUCCESS) ; #endif } @@ -108,7 +110,7 @@ GrB_Info GB (_Adot3B__any_pair_iso) #if GB_DISABLE return (GrB_NO_VALUE) ; #else - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" return (GrB_SUCCESS) ; #endif } @@ -117,7 +119,7 @@ GrB_Info GB (_Adot3B__any_pair_iso) // GB_AsaxbitB: C=A*B, C=A*B, C=A*B: saxpy method, C is bitmap only //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy3_template.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" GrB_Info GB (_AsaxbitB__any_pair_iso) ( @@ -146,7 +148,7 @@ GrB_Info GB (_AsaxbitB__any_pair_iso) #else int nthreads_max = GB_Context_nthreads_max ( ) ; double chunk = GB_Context_chunk ( ) ; - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" return (GrB_SUCCESS) ; #endif } @@ -229,8 +231,8 @@ GrB_Info GB (_Asaxpy3B__any_pair_iso) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -238,8 +240,8 @@ GrB_Info GB (_Asaxpy3B__any_pair_iso) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -279,8 +281,8 @@ GrB_Info GB (_Asaxpy3B__any_pair_iso) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -288,8 +290,8 @@ GrB_Info GB (_Asaxpy3B__any_pair_iso) #undef GB_META16 #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } @@ -331,8 +333,8 @@ GrB_Info GB (_Asaxpy3B__any_pair_iso) #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { @@ -340,8 +342,8 @@ GrB_Info GB (_Asaxpy3B__any_pair_iso) #undef GB_META16 #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_meta16_definitions.h" - #include "GB_AxB_saxpy3_template.c" + #include "mxm/include/GB_meta16_definitions.h" + #include "mxm/template/GB_AxB_saxpy3_template.c" } return (GrB_SUCCESS) ; } diff --git a/GraphBLAS/Source/GB_AxB__include1.h b/GraphBLAS/Source/mxm/GB_AxB__include1.h similarity index 96% rename from GraphBLAS/Source/GB_AxB__include1.h rename to GraphBLAS/Source/mxm/GB_AxB__include1.h index 03fdcc2f41..6d246c7f9a 100644 --- a/GraphBLAS/Source/GB_AxB__include1.h +++ b/GraphBLAS/Source/mxm/GB_AxB__include1.h @@ -2,11 +2,11 @@ // GB_AxB__include1.h: definitions for GB_AxB__*.c methods //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // This file has been automatically generated from Generator/GB_AxB.h -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB (_Adot2B__any_pair_iso) ( diff --git a/GraphBLAS/Source/GB_AxB_dot.c b/GraphBLAS/Source/mxm/GB_AxB_dot.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_dot.c rename to GraphBLAS/Source/mxm/GB_AxB_dot.c index 785091002a..c53e7eda4f 100644 --- a/GraphBLAS/Source/GB_AxB_dot.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot.c @@ -40,8 +40,8 @@ // calling this function (GrB_mxm, GrB_mxv, or GxB_vxm) and detailed error // reports. -#include "GB_mxm.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "jitifyer/GB_stringify.h" #define GB_FREE_ALL ; GrB_Info GB_AxB_dot // dot product (multiple methods) diff --git a/GraphBLAS/Source/GB_AxB_dot2.c b/GraphBLAS/Source/mxm/GB_AxB_dot2.c similarity index 97% rename from GraphBLAS/Source/GB_AxB_dot2.c rename to GraphBLAS/Source/mxm/GB_AxB_dot2.c index 802e9f30e1..6a819d2122 100644 --- a/GraphBLAS/Source/GB_AxB_dot2.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot2.c @@ -40,14 +40,14 @@ GB_phybix_free (C) ; \ } -#include "GB_mxm.h" -#include "GB_subref.h" -#include "GB_ek_slice.h" -#include "GB_bitmap_assign_methods.h" -#include "GB_stringify.h" -#include "GB_AxB__include1.h" +#include "mxm/GB_mxm.h" +#include "extract/GB_subref.h" +#include "slice/GB_ek_slice.h" +#include "assign/GB_bitmap_assign_methods.h" +#include "jitifyer/GB_stringify.h" +#include "mxm/GB_AxB__include1.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif GrB_Info GB_AxB_dot2 // C=A'*B or C<#M>=A'*B, dot product method @@ -297,8 +297,8 @@ GrB_Info GB_AxB_dot2 // C=A'*B or C<#M>=A'*B, dot product method GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (A_slice, A->p, anvec, naslice, false) ; - GB_pslice (B_slice, B->p, bnvec, nbslice, false) ; + GB_p_slice (A_slice, A->p, anvec, naslice, false) ; + GB_p_slice (B_slice, B->p, bnvec, nbslice, false) ; //-------------------------------------------------------------------------- // allocate C @@ -455,7 +455,7 @@ GrB_Info GB_AxB_dot2 // C=A'*B or C<#M>=A'*B, dot product method semiring, flipxy, &mult_binop_code, &add_binop_code, &xcode, &ycode, &zcode)) { - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } ASSERT (info == GrB_SUCCESS || info == GrB_NO_VALUE) ; } @@ -494,7 +494,7 @@ GrB_Info GB_AxB_dot2 // C=A'*B or C<#M>=A'*B, dot product method (M == NULL) ? "" : (Mask_comp ? "" : ""), A_not_transposed ? "" : "'", (C_sparsity == GxB_BITMAP) ? "bitmap" : "full") ; - #include "GB_AxB_dot_generic.c" + #include "mxm/factory/GB_AxB_dot_generic.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_AxB_dot2_control.c b/GraphBLAS/Source/mxm/GB_AxB_dot2_control.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_dot2_control.c rename to GraphBLAS/Source/mxm/GB_AxB_dot2_control.c index acd16cbb29..0ec921de87 100644 --- a/GraphBLAS/Source/GB_AxB_dot2_control.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot2_control.c @@ -10,7 +10,7 @@ // C=A'*B, C=A'*B, or C=A'*B where C is constructed in bitmap format. // C must be small and likely very dense. -#include "GB_mxm.h" +#include "mxm/GB_mxm.h" bool GB_AxB_dot2_control // true: use dot2, false: use saxpy ( diff --git a/GraphBLAS/Source/GB_AxB_dot3.c b/GraphBLAS/Source/mxm/GB_AxB_dot3.c similarity index 96% rename from GraphBLAS/Source/GB_AxB_dot3.c rename to GraphBLAS/Source/mxm/GB_AxB_dot3.c index 8893196d8d..9547c5a20a 100644 --- a/GraphBLAS/Source/GB_AxB_dot3.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot3.c @@ -14,14 +14,14 @@ // JIT: done. -#include "GB_mxm.h" -#include "GB_binop.h" -#include "GB_stringify.h" -#include "GB_AxB__include1.h" +#include "mxm/GB_mxm.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" +#include "mxm/GB_AxB__include1.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif -#include "GB_unused.h" +#include "include/GB_unused.h" #define GB_FREE_WORKSPACE \ { \ @@ -220,7 +220,7 @@ GrB_Info GB_AxB_dot3 // C = A'*B using dot product method // as the pth entry in C. This phase is purely symbolic and does not // depend on the data types or semiring. - #include "GB_mxm_shared_definitions.h" + #include "mxm/include/GB_mxm_shared_definitions.h" #define GB_DOT3 #define GB_DOT3_PHASE1 @@ -228,14 +228,14 @@ GrB_Info GB_AxB_dot3 // C = A'*B using dot product method { // special case: M is present, sparse, structural, and not complemented #define GB_MASK_SPARSE_STRUCTURAL_AND_NOT_COMPLEMENTED - #include "GB_meta16_factory.c" + #include "mxm/template/GB_meta16_factory.c" #undef GB_MASK_SPARSE_STRUCTURAL_AND_NOT_COMPLEMENTED // TODO: skip phase1 if A and B are both bitmap/full. } else { // general case: M sparse/hyper, structural/valued - #include "GB_meta16_factory.c" + #include "mxm/template/GB_meta16_factory.c" } #undef GB_DOT3 @@ -303,7 +303,7 @@ GrB_Info GB_AxB_dot3 // C = A'*B using dot product method semiring, flipxy, &mult_binop_code, &add_binop_code, &xcode, &ycode, &zcode)) { - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } if (info == GrB_SUCCESS) @@ -331,7 +331,7 @@ GrB_Info GB_AxB_dot3 // C = A'*B using dot product method { #define GB_DOT3_GENERIC GB_BURBLE_MATRIX (C, "(generic C=A'*B) ") ; - #include "GB_AxB_dot_generic.c" + #include "mxm/factory/GB_AxB_dot_generic.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_AxB_dot3_one_slice.c b/GraphBLAS/Source/mxm/GB_AxB_dot3_one_slice.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_dot3_one_slice.c rename to GraphBLAS/Source/mxm/GB_AxB_dot3_one_slice.c index d6a4c35eaf..9673fdc749 100644 --- a/GraphBLAS/Source/GB_AxB_dot3_one_slice.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot3_one_slice.c @@ -24,7 +24,7 @@ GB_FREE_WORK (&TaskList, TaskList_size) ; \ } -#include "GB_mxm.h" +#include "mxm/GB_mxm.h" #define GB_NTASKS_PER_THREAD 256 @@ -132,7 +132,7 @@ GrB_Info GB_AxB_dot3_one_slice GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (Coarse, Mp, mnvec, ntasks1, false) ; + GB_p_slice (Coarse, Mp, mnvec, ntasks1, false) ; //-------------------------------------------------------------------------- // construct all tasks, both coarse and fine diff --git a/GraphBLAS/Source/GB_AxB_dot3_slice.c b/GraphBLAS/Source/mxm/GB_AxB_dot3_slice.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_dot3_slice.c rename to GraphBLAS/Source/mxm/GB_AxB_dot3_slice.c index e11fecf86d..ab04fe529f 100644 --- a/GraphBLAS/Source/GB_AxB_dot3_slice.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot3_slice.c @@ -34,8 +34,8 @@ GB_FREE_WORK (&TaskList, TaskList_size) ; \ } -#include "GB_mxm.h" -#include "GB_search_for_vector_template.c" +#include "mxm/GB_mxm.h" +#include "slice/factory/GB_search_for_vector_template.c" //------------------------------------------------------------------------------ // GB_AxB_dot3_slice @@ -154,7 +154,7 @@ GrB_Info GB_AxB_dot3_slice GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (Coarse, Cwork, cnz, ntasks1, false) ; + GB_p_slice (Coarse, Cwork, cnz, ntasks1, false) ; //-------------------------------------------------------------------------- // construct all tasks, both coarse and fine diff --git a/GraphBLAS/Source/GB_AxB_dot4.c b/GraphBLAS/Source/mxm/GB_AxB_dot4.c similarity index 97% rename from GraphBLAS/Source/GB_AxB_dot4.c rename to GraphBLAS/Source/mxm/GB_AxB_dot4.c index daf5e1f605..7153c6a05e 100644 --- a/GraphBLAS/Source/GB_AxB_dot4.c +++ b/GraphBLAS/Source/mxm/GB_AxB_dot4.c @@ -22,12 +22,12 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" -#include "GB_binop.h" -#include "GB_unused.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "binaryop/GB_binop.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif #define GB_FREE_WORKSPACE \ @@ -206,8 +206,8 @@ GrB_Info GB_AxB_dot4 // C+=A'*B, dot product method GB_FREE_WORKSPACE ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (A_slice, A->p, anvec, naslice, false) ; - GB_pslice (B_slice, B->p, bnvec, nbslice, false) ; + GB_p_slice (A_slice, A->p, anvec, naslice, false) ; + GB_p_slice (B_slice, B->p, bnvec, nbslice, false) ; //-------------------------------------------------------------------------- // convert C to non-iso @@ -250,7 +250,7 @@ GrB_Info GB_AxB_dot4 // C+=A'*B, dot product method // disabled the ANY monoid #define GB_NO_ANY_MONOID - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } #endif diff --git a/GraphBLAS/Source/GB_AxB_iso.c b/GraphBLAS/Source/mxm/GB_AxB_iso.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_iso.c rename to GraphBLAS/Source/mxm/GB_AxB_iso.c index 45174f4abb..47d14cdc52 100644 --- a/GraphBLAS/Source/GB_AxB_iso.c +++ b/GraphBLAS/Source/mxm/GB_AxB_iso.c @@ -19,9 +19,9 @@ // C = A*B' n = A->vdim == B->vdim // C = A'*B' n = A->vlen == B->vdim -#include "GB_mxm.h" -#include "GB_reduce.h" -#include "GB_binop.h" +#include "mxm/GB_mxm.h" +#include "reduce/GB_reduce.h" +#include "binaryop/GB_binop.h" //------------------------------------------------------------------------------ // GB_AxB_scalar_iso: c = mult(a,b) or c = mult(b,a) diff --git a/GraphBLAS/Source/GB_AxB_meta.c b/GraphBLAS/Source/mxm/GB_AxB_meta.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_meta.c rename to GraphBLAS/Source/mxm/GB_AxB_meta.c index 88390cd453..bdbdbe8098 100644 --- a/GraphBLAS/Source/GB_AxB_meta.c +++ b/GraphBLAS/Source/mxm/GB_AxB_meta.c @@ -35,8 +35,8 @@ GB_phybix_free (MT) ; \ } -#include "GB_mxm.h" -#include "GB_transpose.h" +#include "mxm/GB_mxm.h" +#include "transpose/GB_transpose.h" GrB_Info GB_AxB_meta // C=A*B meta algorithm ( diff --git a/GraphBLAS/Source/GB_AxB_meta_adotb_control.c b/GraphBLAS/Source/mxm/GB_AxB_meta_adotb_control.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_meta_adotb_control.c rename to GraphBLAS/Source/mxm/GB_AxB_meta_adotb_control.c index 7ab5349f07..51c1f5fca1 100644 --- a/GraphBLAS/Source/GB_AxB_meta_adotb_control.c +++ b/GraphBLAS/Source/mxm/GB_AxB_meta_adotb_control.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" +#include "mxm/GB_mxm.h" void GB_AxB_meta_adotb_control ( diff --git a/GraphBLAS/Source/GB_AxB_saxbit.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit.c similarity index 96% rename from GraphBLAS/Source/GB_AxB_saxbit.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit.c index 9edc8f19da..434767d2c4 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit.c @@ -24,16 +24,16 @@ GB_phybix_free (C) ; \ } -#include "GB_mxm.h" -#include "GB_unused.h" -#include "GB_stringify.h" -#include "GB_AxB_saxpy.h" -#include "GB_binop.h" -#include "GB_ek_slice.h" -#include "GB_AxB_saxpy_generic.h" -#include "GB_AxB__include1.h" +#include "mxm/GB_mxm.h" +#include "include/GB_unused.h" +#include "jitifyer/GB_stringify.h" +#include "mxm/GB_AxB_saxpy.h" +#include "binaryop/GB_binop.h" +#include "slice/GB_ek_slice.h" +#include "mxm/GB_AxB_saxpy_generic.h" +#include "mxm/GB_AxB__include1.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif //------------------------------------------------------------------------------ @@ -168,7 +168,7 @@ GrB_Info GB_AxB_saxbit // C = A*B where C is bitmap GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (A_slice, A->p, A->nvec, nfine_tasks_per_vector, true) ; + GB_p_slice (A_slice, A->p, A->nvec, nfine_tasks_per_vector, true) ; } //---------------------------------------------------------------------- @@ -302,7 +302,7 @@ GrB_Info GB_AxB_saxbit // C = A*B where C is bitmap semiring, flipxy, &mult_binop_code, &add_binop_code, &xcode, &ycode, &zcode)) { - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_first.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_first.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_first.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_first.c index 170c9370f2..5661f88e8d 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_first.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_first.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 1 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_firsti32.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firsti32.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_firsti32.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firsti32.c index 6c405ca0db..1a7410ec7d 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_firsti32.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firsti32.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_firsti64.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firsti64.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_firsti64.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firsti64.c index eab7b5442b..e4a1274e19 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_firsti64.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firsti64.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_firstj32.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firstj32.c similarity index 95% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_firstj32.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firstj32.c index e465fd4b44..d3efa7148b 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_firstj32.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firstj32.c @@ -21,5 +21,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_firstj64.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firstj64.c similarity index 95% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_firstj64.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firstj64.c index 041216aeb4..4c47dd8858 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_firstj64.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_firstj64.c @@ -21,5 +21,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_flipped.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_flipped.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_flipped.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_flipped.c index 7a03746882..6773fe2fdb 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_flipped.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_flipped.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_second.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_second.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_second.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_second.c index ea3cbfc05b..81ed5d620e 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_second.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_second.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 1 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_secondj32.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_secondj32.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_secondj32.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_secondj32.c index eff2376f22..8d81942b40 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_secondj32.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_secondj32.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_secondj64.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_secondj64.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_secondj64.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_secondj64.c index 666a04dd12..637644448b 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_secondj64.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_secondj64.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxbit_generic_unflipped.c b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_unflipped.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxbit_generic_unflipped.c rename to GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_unflipped.c index 7410ad42da..44f10206be 100644 --- a/GraphBLAS/Source/GB_AxB_saxbit_generic_unflipped.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxbit_generic_unflipped.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy.c index 49b31ae6f7..fa3c3f012d 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" -#include "GB_AxB_saxpy.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "mxm/GB_AxB_saxpy.h" +#include "jitifyer/GB_stringify.h" // TODO: allow bitmap multiply to work in-place as well diff --git a/GraphBLAS/Source/GB_AxB_saxpy.h b/GraphBLAS/Source/mxm/GB_AxB_saxpy.h similarity index 98% rename from GraphBLAS/Source/GB_AxB_saxpy.h rename to GraphBLAS/Source/mxm/GB_AxB_saxpy.h index 5a37f7d999..50e37f6a31 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy.h +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy.h @@ -10,8 +10,8 @@ #ifndef GB_AXB_SAXPY_H #define GB_AXB_SAXPY_H #include "GB.h" -#include "GB_math.h" -#include "GB_AxB_saxpy3.h" +#include "math/GB_math.h" +#include "mxm/GB_AxB_saxpy3.h" //------------------------------------------------------------------------------ // GB_AxB_saxpy diff --git a/GraphBLAS/Source/GB_AxB_saxpy3.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy3.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3.c index 9e55cfaf2b..5820a5a720 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3.c @@ -89,15 +89,14 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" -#include "GB_stringify.h" -#include "GB_AxB_saxpy_generic.h" -#include "GB_control.h" -#include "GB_AxB__include1.h" +#include "mxm/GB_mxm.h" +#include "jitifyer/GB_stringify.h" +#include "mxm/GB_AxB_saxpy_generic.h" +#include "mxm/GB_AxB__include1.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif -#include "GB_unused.h" +#include "include/GB_unused.h" #define GB_FREE_WORKSPACE \ { \ @@ -648,7 +647,7 @@ GrB_Info GB_AxB_saxpy3 // C = A*B using Gustavson+Hash if (builtin_semiring) { - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_AxB_saxpy3.h b/GraphBLAS/Source/mxm/GB_AxB_saxpy3.h similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy3.h rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3.h index 6d23a54897..7bfa79bec4 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3.h +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3.h @@ -14,7 +14,7 @@ #define GB_AXB_SAXPY3_H #include "GB.h" -#include "GB_math.h" +#include "math/GB_math.h" GrB_Info GB_AxB_saxpy3 // C = A*B using Gustavson+Hash ( @@ -60,7 +60,7 @@ GrB_Info GB_AxB_saxpy3 // C = A*B using Gustavson+Hash // Hash method is not used, and Gustavson's method is used, with the hash size // is set to C->vlen. -#include "GB_saxpy3task_struct.h" +#include "mxm/include/GB_saxpy3task_struct.h" //------------------------------------------------------------------------------ // GB_AxB_saxpy3_flopcount: compute flops for GB_AxB_saxpy3 diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_cumsum.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_cumsum.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy3_cumsum.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_cumsum.c index 83a528e415..b17c5e86a5 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_cumsum.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_cumsum.c @@ -13,7 +13,7 @@ // phase4: cumulative sum of C->p #include "GB.h" -#include "GB_unused.h" +#include "include/GB_unused.h" GB_CALLBACK_SAXPY3_CUMSUM_PROTO (GB_AxB_saxpy3_cumsum) { diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_flopcount.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_flopcount.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy3_flopcount.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_flopcount.c index a514c72df7..af1bed3cb3 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_flopcount.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_flopcount.c @@ -67,10 +67,10 @@ end */ -#include "GB_mxm.h" -#include "GB_ek_slice.h" -#include "GB_AxB_saxpy3.h" -#include "GB_unused.h" +#include "mxm/GB_mxm.h" +#include "slice/GB_ek_slice.h" +#include "mxm/GB_AxB_saxpy3.h" +#include "include/GB_unused.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_first.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_first.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_first.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_first.c index a08d1bf221..f49767cab0 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_first.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_first.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 1 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firsti32.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firsti32.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_firsti32.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firsti32.c index e0c64bfe7c..c857381131 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firsti32.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firsti32.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firsti64.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firsti64.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_firsti64.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firsti64.c index 516de4661f..36a39fdf74 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firsti64.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firsti64.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firstj32.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firstj32.c similarity index 95% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_firstj32.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firstj32.c index cb812c2417..10cf462986 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firstj32.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firstj32.c @@ -21,5 +21,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firstj64.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firstj64.c similarity index 95% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_firstj64.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firstj64.c index 754265a7ec..f5bf02f050 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_firstj64.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_firstj64.c @@ -21,5 +21,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_flipped.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_flipped.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_flipped.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_flipped.c index 8513bb52d1..20e9eb435f 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_flipped.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_flipped.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_second.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_second.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_second.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_second.c index 9a92fd8e91..9dba760189 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_second.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_second.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 1 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_secondj32.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_secondj32.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_secondj32.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_secondj32.c index fd6b48bb49..3bbbdfee16 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_secondj32.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_secondj32.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_secondj64.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_secondj64.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_secondj64.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_secondj64.c index b96f820dfe..aeaa189449 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_secondj64.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_secondj64.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_generic_unflipped.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_unflipped.c similarity index 94% rename from GraphBLAS/Source/GB_AxB_saxpy3_generic_unflipped.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_unflipped.c index 68f45f7625..2fd9d2581c 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_generic_unflipped.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_generic_unflipped.c @@ -20,5 +20,5 @@ #define GB_GENERIC_OP_IS_FIRST 0 #define GB_GENERIC_OP_IS_SECOND 0 -#include "GB_AxB_saxpy_generic_method.c" +#include "mxm/factory/GB_AxB_saxpy_generic_method.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_slice_balanced.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_slice_balanced.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy3_slice_balanced.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_slice_balanced.c index 61109d5d86..668ee9b389 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_slice_balanced.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_slice_balanced.c @@ -12,8 +12,8 @@ // If the mask is present but must be discarded, this function returns // GrB_NO_VALUE, to indicate that the analysis was terminated early. -#include "GB_AxB_saxpy3.h" -#include "GB_unused.h" +#include "mxm/GB_AxB_saxpy3.h" +#include "include/GB_unused.h" // control parameters for generating parallel tasks #define GB_NTASKS_PER_THREAD 2 @@ -484,7 +484,7 @@ GrB_Info GB_AxB_saxpy3_slice_balanced GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (Coarse_initial, Bflops, bnvec, ntasks_initial, true) ; + GB_p_slice (Coarse_initial, Bflops, bnvec, ntasks_initial, true) ; //---------------------------------------------------------------------- // split the work into coarse and fine tasks @@ -699,7 +699,8 @@ GrB_Info GB_AxB_saxpy3_slice_balanced // slice B(:,j) into fine tasks int team_size = ceil (jflops / target_fine_size) ; ASSERT (Fine_slice != NULL) ; - GB_pslice (Fine_slice, Fine_fl, bjnz, team_size, false); + GB_p_slice (Fine_slice, Fine_fl, bjnz, team_size, + false); // shared hash table for all fine tasks for A*B(:,j) int64_t hsize = diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_slice_quick.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_slice_quick.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_saxpy3_slice_quick.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_slice_quick.c index 409508b600..35cf3e5cd5 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_slice_quick.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_slice_quick.c @@ -9,7 +9,7 @@ // create a single task for C=A*B, for a single thread. -#include "GB_AxB_saxpy3.h" +#include "mxm/GB_AxB_saxpy3.h" GrB_Info GB_AxB_saxpy3_slice_quick ( diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_bh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_bh.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_bh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_bh.c index 097148b088..e369e3b82b 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_bh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_bh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_bs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_bs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_bs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_bs.c index 2ec7b790bc..b420fae473 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_bs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_bs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_fh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_fh.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_fh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_fh.c index 9e42d8bc22..c497418f1c 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_fh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_fh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_fs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_fs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_fs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_fs.c index 129872de55..3a435525ec 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_fs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_fs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hb.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_hb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hb.c index e12ea40552..ad4c3bdf03 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hf.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_hf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hf.c index 657239cce6..ec1544f352 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hh.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_hh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hh.c index c3fdf5b6cc..3517a50307 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hs.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_hs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hs.c index d39659dd97..db9191c9dd 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_hs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_hs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mbb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbb.c index d4a8fbc7e6..a84ce80578 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbf.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mbf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbf.c index bc8c40ee36..46df7f020e 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mbh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbh.c index 9bca8cfc08..c310077c1c 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mbs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbs.c index e97ef00845..b2191f563e 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mbs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mbs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mfb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mfb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfb.c index 94a3399d92..cd0dacd1a4 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mfb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mff.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mff.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mff.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mff.c index 39d073a04b..7fd8667bbe 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mff.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mff.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mfh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mfh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfh.c index 7c82e4d43b..da5f78c3f3 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mfh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mfs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mfs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfs.c index beb4a074e7..a44d7c0a82 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mfs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mfs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mhb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhb.c index 893c455fef..de13de44bb 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhf.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mhf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhf.c index f8ccc3fc70..8e9014e659 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mhh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhh.c index 6bec8c146a..da5ecb2146 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mhs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhs.c index e002efa766..56676f40c3 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mhs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mhs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_msb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_msb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msb.c index 66855fa29a..d08bddf4e8 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_msb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_msf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msf.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_msf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msf.c index 7d83d629e1..b6f2f7e3d0 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_msf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_msh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_msh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msh.c index fe7f9e9806..b0e99281fa 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_msh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_msh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mss.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mss.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_mss.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mss.c index 16acce956d..ae8d004392 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_mss.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_mss.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nbh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nbh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nbh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nbh.c index 5bc6d1e0f8..85dfb5378f 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nbh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nbh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nbs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nbs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nbs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nbs.c index 54ff9aae69..cac3197bd4 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nbs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nbs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nfh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nfh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nfh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nfh.c index c4c89345db..6dfccea274 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nfh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nfh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nfs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nfs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nfs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nfs.c index dbf709b655..18d605a52f 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nfs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nfs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nhb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhb.c index 3268902270..e8383b2a38 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhf.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nhf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhf.c index 53f9fabefa..988f15c748 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nhh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhh.c index 9a3d023730..87f62c4f61 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhs.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhs.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nhs.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhs.c index 5cbc0917d9..aa015d2c05 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nhs.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nhs.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nsb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nsb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsb.c index 14a704ad64..41e1b9be22 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nsb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nsf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsf.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nsf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsf.c index 1eef943b63..2964ad4012 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nsf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nsh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsh.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nsh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsh.c index 0bebc88e75..0d73e2b331 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nsh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nsh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nss.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nss.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_nss.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nss.c index 9623c0a4e8..7fff84fb48 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_nss.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_nss.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_sb.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sb.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_sb.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sb.c index 47f796fe6c..85d178311e 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_sb.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sb.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_sf.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sf.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_sf.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sf.c index 2b279fa91a..8dfe24c184 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_sf.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sf.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_sh.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sh.c similarity index 93% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_sh.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sh.c index 83f2548de4..92147eceea 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_sh.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_sh.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_sym_ss.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_ss.c similarity index 92% rename from GraphBLAS/Source/GB_AxB_saxpy3_sym_ss.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_ss.c index cb6ff29171..caf35e676a 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_sym_ss.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_sym_ss.c @@ -24,5 +24,5 @@ #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 -#include "GB_AxB_saxpy3_symbolic_template.c" +#include "mxm/factory/GB_AxB_saxpy3_symbolic_template.c" diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_symbolic.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_symbolic.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy3_symbolic.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy3_symbolic.c index 82854789fb..08a58e2e10 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy3_symbolic.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy3_symbolic.c @@ -19,7 +19,7 @@ // If both A and B are bitmap/full for C=A*B or C=A*B, then saxpy3 is // not used. C is selected as bitmap instead. -#include "GB_AxB_saxpy3.h" +#include "mxm/GB_AxB_saxpy3.h" void GB_AxB_saxpy3_symbolic ( diff --git a/GraphBLAS/Source/GB_AxB_saxpy4.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy4.c similarity index 97% rename from GraphBLAS/Source/GB_AxB_saxpy4.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy4.c index 7a56787c53..30800d18ec 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy4.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy4.c @@ -20,11 +20,10 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" -#include "GB_control.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif #define GB_FREE_WORKSPACE \ @@ -190,7 +189,7 @@ GrB_Info GB_AxB_saxpy4 // C += A*B GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (A_slice, A->p, A->nvec, nfine_tasks_per_vector, true) ; + GB_p_slice (A_slice, A->p, A->nvec, nfine_tasks_per_vector, true) ; if (!use_atomics) { @@ -261,7 +260,7 @@ GrB_Info GB_AxB_saxpy4 // C += A*B #define GB_NO_ANY_MONOID if (builtin_semiring) { - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } } diff --git a/GraphBLAS/Source/GB_AxB_saxpy4_tasks.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy4_tasks.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy4_tasks.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy4_tasks.c index 6b602e8c4d..209b824b65 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy4_tasks.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy4_tasks.c @@ -10,7 +10,7 @@ // GB_AxB_saxpy4_tasks constructs the tasks for GB_AxB_saxpy4, and for // GB_AxB_bitmap_saxpy when A is sparse/hyper and B is bitmap/full. -#include "GB_AxB_saxpy.h" +#include "mxm/GB_AxB_saxpy.h" void GB_AxB_saxpy4_tasks ( diff --git a/GraphBLAS/Source/GB_AxB_saxpy5.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy5.c similarity index 97% rename from GraphBLAS/Source/GB_AxB_saxpy5.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy5.c index 0731b2d70e..5a1cee24d9 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy5.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy5.c @@ -30,11 +30,10 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" -#include "GB_control.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_AxB__include2.h" +#include "FactoryKernels/GB_AxB__include2.h" #endif #define GB_FREE_WORKSPACE \ @@ -151,7 +150,7 @@ GrB_Info GB_AxB_saxpy5 // C += A*B GB_FREE_WORKSPACE ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (B_slice, B->p, bnvec, ntasks, false) ; + GB_p_slice (B_slice, B->p, bnvec, ntasks, false) ; //-------------------------------------------------------------------------- // via the factory kernel @@ -183,7 +182,7 @@ GrB_Info GB_AxB_saxpy5 // C += A*B #define GB_NO_ANY_MONOID if (builtin_semiring) { - #include "GB_AxB_factory.c" + #include "mxm/factory/GB_AxB_factory.c" } } #endif diff --git a/GraphBLAS/Source/GB_AxB_saxpy_generic.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy_generic.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy_generic.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy_generic.c index 0d5adcb0b9..28e9d5eadf 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy_generic.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy_generic.c @@ -31,9 +31,9 @@ //------------------------------------------------------------------------------ -#include "GB_mxm.h" -#include "GB_binop.h" -#include "GB_AxB_saxpy_generic.h" +#include "mxm/GB_mxm.h" +#include "binaryop/GB_binop.h" +#include "mxm/GB_AxB_saxpy_generic.h" GrB_Info GB_AxB_saxpy_generic ( diff --git a/GraphBLAS/Source/GB_AxB_saxpy_generic.h b/GraphBLAS/Source/mxm/GB_AxB_saxpy_generic.h similarity index 100% rename from GraphBLAS/Source/GB_AxB_saxpy_generic.h rename to GraphBLAS/Source/mxm/GB_AxB_saxpy_generic.h diff --git a/GraphBLAS/Source/GB_AxB_saxpy_sparsity.c b/GraphBLAS/Source/mxm/GB_AxB_saxpy_sparsity.c similarity index 99% rename from GraphBLAS/Source/GB_AxB_saxpy_sparsity.c rename to GraphBLAS/Source/mxm/GB_AxB_saxpy_sparsity.c index 302ae05063..b394ccc424 100644 --- a/GraphBLAS/Source/GB_AxB_saxpy_sparsity.c +++ b/GraphBLAS/Source/mxm/GB_AxB_saxpy_sparsity.c @@ -16,7 +16,7 @@ //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy.h" +#include "mxm/GB_AxB_saxpy.h" void GB_AxB_saxpy_sparsity // determine C_sparsity and method to use ( diff --git a/GraphBLAS/Source/GB_AxB_semiring_builtin.c b/GraphBLAS/Source/mxm/GB_AxB_semiring_builtin.c similarity index 98% rename from GraphBLAS/Source/GB_AxB_semiring_builtin.c rename to GraphBLAS/Source/mxm/GB_AxB_semiring_builtin.c index f4bae32172..6a7ac1ccac 100644 --- a/GraphBLAS/Source/GB_AxB_semiring_builtin.c +++ b/GraphBLAS/Source/mxm/GB_AxB_semiring_builtin.c @@ -14,8 +14,8 @@ // typecast the entries in the matrices A and B to the types of x and y of the // operator, as needed. -#include "GB_mxm.h" -#include "GB_binop.h" +#include "mxm/GB_mxm.h" +#include "binaryop/GB_binop.h" bool GB_AxB_semiring_builtin // true if semiring is builtin ( diff --git a/GraphBLAS/Source/GB_bitmap_expand_to_hyper.c b/GraphBLAS/Source/mxm/GB_bitmap_expand_to_hyper.c similarity index 99% rename from GraphBLAS/Source/GB_bitmap_expand_to_hyper.c rename to GraphBLAS/Source/mxm/GB_bitmap_expand_to_hyper.c index 9135100806..73f5f488bd 100644 --- a/GraphBLAS/Source/GB_bitmap_expand_to_hyper.c +++ b/GraphBLAS/Source/mxm/GB_bitmap_expand_to_hyper.c @@ -17,7 +17,7 @@ GB_FREE (&Ci, Ci_size) ; \ } -#include "GB_mxm.h" +#include "mxm/GB_mxm.h" GrB_Info GB_bitmap_expand_to_hyper ( diff --git a/GraphBLAS/Source/GB_colscale.c b/GraphBLAS/Source/mxm/GB_colscale.c similarity index 96% rename from GraphBLAS/Source/GB_colscale.c rename to GraphBLAS/Source/mxm/GB_colscale.c index c0b69ee679..e9d57fb7e6 100644 --- a/GraphBLAS/Source/GB_colscale.c +++ b/GraphBLAS/Source/mxm/GB_colscale.c @@ -9,15 +9,15 @@ // JIT: done. -#include "GB_mxm.h" -#include "GB_binop.h" -#include "GB_apply.h" -#include "GB_ek_slice.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "binaryop/GB_binop.h" +#include "apply/GB_apply.h" +#include "slice/GB_ek_slice.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif -#include "GB_unused.h" +#include "include/GB_unused.h" #define GB_FREE_WORKSPACE \ { \ @@ -261,7 +261,7 @@ GrB_Info GB_colscale // C = A*D, column scale with diagonal D // C=A*D, colscale with built-in operator #define GB_BINOP_IS_SEMIRING_MULTIPLIER #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" #undef GB_BINOP_IS_SEMIRING_MULTIPLIER } } @@ -288,7 +288,7 @@ GrB_Info GB_colscale // C = A*D, column scale with diagonal D // get operators, functions, workspace, contents of A, D, and C //------------------------------------------------------------------ - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (C, "(generic C=A*D colscale) ") ; GxB_binary_function fmult = mult->binop_function ; @@ -349,19 +349,19 @@ GrB_Info GB_colscale // C = A*D, column scale with diagonal D #define GB_C_TYPE GB_void - #include "GB_ewise_shared_definitions.h" + #include "ewise/include/GB_ewise_shared_definitions.h" if (flipxy) { #undef GB_EWISEOP #define GB_EWISEOP(Cx,p,x,y,i,j) fmult (Cx +((p)*csize),y,x) - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" } else { #undef GB_EWISEOP #define GB_EWISEOP(Cx,p,x,y,i,j) fmult (Cx +((p)*csize),x,y) - #include "GB_colscale_template.c" + #include "mxm/template/GB_colscale_template.c" } info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_is_diagonal.c b/GraphBLAS/Source/mxm/GB_is_diagonal.c similarity index 99% rename from GraphBLAS/Source/GB_is_diagonal.c rename to GraphBLAS/Source/mxm/GB_is_diagonal.c index b72d56162a..a06fcd47a5 100644 --- a/GraphBLAS/Source/GB_is_diagonal.c +++ b/GraphBLAS/Source/mxm/GB_is_diagonal.c @@ -12,7 +12,7 @@ // Returns true if A is a square diagonal matrix, with all diagonal entries // present. All pending tuples are ignored. Zombies are treated as entries. -#include "GB_mxm.h" +#include "mxm/GB_mxm.h" bool GB_is_diagonal // true if A is diagonal ( diff --git a/GraphBLAS/Source/GB_mxm.c b/GraphBLAS/Source/mxm/GB_mxm.c similarity index 99% rename from GraphBLAS/Source/GB_mxm.c rename to GraphBLAS/Source/mxm/GB_mxm.c index 04ff65588e..6e293a892a 100644 --- a/GraphBLAS/Source/GB_mxm.c +++ b/GraphBLAS/Source/mxm/GB_mxm.c @@ -18,8 +18,8 @@ GB_Matrix_free (&T) ; \ } -#include "GB_mxm.h" -#include "GB_accum_mask.h" +#include "mxm/GB_mxm.h" +#include "mask/GB_accum_mask.h" GrB_Info GB_mxm // C = A*B ( diff --git a/GraphBLAS/Source/GB_mxm.h b/GraphBLAS/Source/mxm/GB_mxm.h similarity index 99% rename from GraphBLAS/Source/GB_mxm.h rename to GraphBLAS/Source/mxm/GB_mxm.h index d37261a41f..5fd9f83d7f 100644 --- a/GraphBLAS/Source/GB_mxm.h +++ b/GraphBLAS/Source/mxm/GB_mxm.h @@ -9,8 +9,8 @@ #ifndef GB_MXM_H #define GB_MXM_H -#include "GB_AxB_saxpy.h" -#include "GB_binop.h" +#include "mxm/GB_AxB_saxpy.h" +#include "binaryop/GB_binop.h" //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_rowscale.c b/GraphBLAS/Source/mxm/GB_rowscale.c similarity index 96% rename from GraphBLAS/Source/GB_rowscale.c rename to GraphBLAS/Source/mxm/GB_rowscale.c index f43eabb3b1..394e7259f2 100644 --- a/GraphBLAS/Source/GB_rowscale.c +++ b/GraphBLAS/Source/mxm/GB_rowscale.c @@ -9,12 +9,12 @@ // JIT: done. -#include "GB_mxm.h" -#include "GB_binop.h" -#include "GB_apply.h" -#include "GB_stringify.h" +#include "mxm/GB_mxm.h" +#include "binaryop/GB_binop.h" +#include "apply/GB_apply.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_ew__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif #define GB_FREE_ALL GB_phybix_free (C) ; @@ -242,7 +242,7 @@ GrB_Info GB_rowscale // C = D*B, row scale with diagonal D // C=D*B, rowscale with built-in operator #define GB_BINOP_IS_SEMIRING_MULTIPLIER #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" #undef GB_BINOP_IS_SEMIRING_MULTIPLIER } } @@ -272,7 +272,7 @@ GrB_Info GB_rowscale // C = D*B, row scale with diagonal D // get operators, functions, workspace, contents of D, B, and C //------------------------------------------------------------------ - #include "GB_generic.h" + #include "generic/GB_generic.h" GB_BURBLE_MATRIX (C, "(generic C=D*B rowscale) ") ; GxB_binary_function fmult = mult->binop_function ; @@ -333,19 +333,19 @@ GrB_Info GB_rowscale // C = D*B, row scale with diagonal D #define GB_C_TYPE GB_void - #include "GB_ewise_shared_definitions.h" + #include "ewise/include/GB_ewise_shared_definitions.h" if (flipxy) { #undef GB_EWISEOP #define GB_EWISEOP(Cx,p,x,y,i,j) fmult (Cx +((p)*csize),y,x) - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" } else { #undef GB_EWISEOP #define GB_EWISEOP(Cx,p,x,y,i,j) fmult (Cx +((p)*csize),x,y) - #include "GB_rowscale_template.c" + #include "mxm/template/GB_rowscale_template.c" } info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GrB_mxm.c b/GraphBLAS/Source/mxm/GrB_mxm.c similarity index 98% rename from GraphBLAS/Source/GrB_mxm.c rename to GraphBLAS/Source/mxm/GrB_mxm.c index 8ef37b6c9a..c74b783b46 100644 --- a/GraphBLAS/Source/GrB_mxm.c +++ b/GraphBLAS/Source/mxm/GrB_mxm.c @@ -12,8 +12,8 @@ // The input matrices A and B are optionally transposed, as determined by the // Descriptor desc. -#include "GB_mxm.h" -#include "GB_get_mask.h" +#include "mxm/GB_mxm.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_mxm // C = accum (C, A*B) ( diff --git a/GraphBLAS/Source/GrB_mxv.c b/GraphBLAS/Source/mxm/GrB_mxv.c similarity index 98% rename from GraphBLAS/Source/GrB_mxv.c rename to GraphBLAS/Source/mxm/GrB_mxv.c index 97c44ede3f..092b68cab6 100644 --- a/GraphBLAS/Source/GrB_mxv.c +++ b/GraphBLAS/Source/mxm/GrB_mxv.c @@ -12,8 +12,8 @@ // The input matrix A is optionally transposed, as determined by the // Descriptor desc. -#include "GB_mxm.h" -#include "GB_get_mask.h" +#include "mxm/GB_mxm.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_mxv // w = accum (w, A*u) ( diff --git a/GraphBLAS/Source/GrB_vxm.c b/GraphBLAS/Source/mxm/GrB_vxm.c similarity index 98% rename from GraphBLAS/Source/GrB_vxm.c rename to GraphBLAS/Source/mxm/GrB_vxm.c index e94da9c0aa..c49f91e1c4 100644 --- a/GraphBLAS/Source/GrB_vxm.c +++ b/GraphBLAS/Source/mxm/GrB_vxm.c @@ -13,8 +13,8 @@ // w = accum (w,t) where t = A'*u or A*u, but with the multiply operator // flipped. The input descriptor for A, inp1, is also negated. -#include "GB_mxm.h" -#include "GB_get_mask.h" +#include "mxm/GB_mxm.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_vxm // w' = accum (w', u'*A) ( diff --git a/GraphBLAS/Source/Factories/GB_AxB_bitwise_factory.c b/GraphBLAS/Source/mxm/factory/GB_AxB_bitwise_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_AxB_bitwise_factory.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_bitwise_factory.c diff --git a/GraphBLAS/Source/Factories/GB_AxB_compare_factory.c b/GraphBLAS/Source/mxm/factory/GB_AxB_compare_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_AxB_compare_factory.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_compare_factory.c diff --git a/GraphBLAS/Source/Factories/GB_AxB_dot_generic.c b/GraphBLAS/Source/mxm/factory/GB_AxB_dot_generic.c similarity index 90% rename from GraphBLAS/Source/Factories/GB_AxB_dot_generic.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_dot_generic.c index af326876b2..411b7e040a 100644 --- a/GraphBLAS/Source/Factories/GB_AxB_dot_generic.c +++ b/GraphBLAS/Source/mxm/factory/GB_AxB_dot_generic.c @@ -14,8 +14,8 @@ // This file does not use GB_DECLARE_TERMINAL_CONST (zterminal). Instead, it // defines zterminal itself. -#include "GB_mxm_shared_definitions.h" -#include "GB_generic.h" +#include "mxm/include/GB_mxm_shared_definitions.h" +#include "generic/GB_generic.h" { @@ -139,9 +139,9 @@ #undef GB_MULT #define GB_MULT(t, aki, bkj, i, k, j) t = i + offset #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif break ; case GB_FIRSTJ_binop_code : // first_j(A'(i,k),y) == k @@ -151,9 +151,9 @@ #undef GB_MULT #define GB_MULT(t, aki, bkj, i, k, j) t = k + offset #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif break ; case GB_SECONDJ_binop_code : // second_j(x,B(k,j)) == j @@ -161,9 +161,9 @@ #undef GB_MULT #define GB_MULT(t, aki, bkj, i, k, j) t = j + offset #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif break ; default: ; @@ -188,9 +188,9 @@ #undef GB_MULT #define GB_MULT(t,aki,bkj,i,k,j) t = (int32_t) (i + offset) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif break ; case GB_FIRSTJ_binop_code : // first_j(A'(i,k),y) == k @@ -200,9 +200,9 @@ #undef GB_MULT #define GB_MULT(t,aki,bkj,i,k,j) t = (int32_t) (k + offset) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif break ; case GB_SECONDJ_binop_code : // second_j(x,B(k,j)) == j @@ -210,9 +210,9 @@ #undef GB_MULT #define GB_MULT(t,aki,bkj,i,k,j) t = (int32_t) (j + offset) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif break ; default: ; @@ -292,9 +292,9 @@ #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) memcpy (t, aik, csize) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif } else if (opcode == GB_SECOND_binop_code) @@ -306,9 +306,9 @@ #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) memcpy (t, bkj, csize) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif } else if (flipxy) @@ -317,9 +317,9 @@ #undef GB_MULT #define GB_MULT(t, aki, bkj, i, k, j) fmult (t, bkj, aki) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif } else @@ -328,9 +328,9 @@ #undef GB_MULT #define GB_MULT(t, aki, bkj, i, k, j) fmult (t, aki, bkj) #if defined ( GB_DOT2_GENERIC ) - #include "GB_AxB_dot2_meta.c" + #include "mxm/template/GB_AxB_dot2_meta.c" #elif defined ( GB_DOT3_GENERIC ) - #include "GB_AxB_dot3_meta.c" + #include "mxm/template/GB_AxB_dot3_meta.c" #endif } } diff --git a/GraphBLAS/Source/Factories/GB_AxB_factory.c b/GraphBLAS/Source/mxm/factory/GB_AxB_factory.c similarity index 89% rename from GraphBLAS/Source/Factories/GB_AxB_factory.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_factory.c index 739f27a12a..a65049d3c5 100644 --- a/GraphBLAS/Source/Factories/GB_AxB_factory.c +++ b/GraphBLAS/Source/mxm/factory/GB_AxB_factory.c @@ -52,7 +52,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 6: (plus,times,any) for 2 complex #define GB_MNAME _first #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -65,7 +65,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 6: (plus,times,any) for 2 complex #define GB_MNAME _second #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -76,7 +76,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // MIN == TIMES == AND for boolean #define GB_NO_BOOLEAN #define GB_MNAME _min - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -87,7 +87,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // MAX == PLUS == OR for boolean #define GB_NO_BOOLEAN #define GB_MNAME _max - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -101,7 +101,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_NO_BOOLEAN #define GB_MNAME _plus #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -115,7 +115,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_NO_BOOLEAN #define GB_MNAME _minus #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -128,7 +128,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_NO_BOOLEAN #define GB_MNAME _rminus #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -141,7 +141,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_NO_BOOLEAN #define GB_MNAME _times #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -155,7 +155,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_NO_BOOLEAN #define GB_MNAME _div #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -169,7 +169,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_NO_BOOLEAN #define GB_MNAME _rdiv #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -178,7 +178,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 55 semirings: (and,or,xor,eq,any) * 11 types (all but complex) #define GB_MNAME _eq - #include "GB_AxB_compare_factory.c" + #include "mxm/factory/GB_AxB_compare_factory.c" break ; //---------------------------------------------------------------------- @@ -189,7 +189,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // MINUS == RMINUS == NE == ISNE == XOR for boolean #define GB_NO_BOOLEAN #define GB_MNAME _ne - #include "GB_AxB_compare_factory.c" + #include "mxm/factory/GB_AxB_compare_factory.c" break ; //---------------------------------------------------------------------- @@ -198,7 +198,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 55 semirings: (and,or,xor,eq,any) * 11 types (all but complex) #define GB_MNAME _gt - #include "GB_AxB_compare_factory.c" + #include "mxm/factory/GB_AxB_compare_factory.c" break ; //---------------------------------------------------------------------- @@ -207,7 +207,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 55 semirings: (and,or,xor,eq,any) * 11 types (all but complex) #define GB_MNAME _lt - #include "GB_AxB_compare_factory.c" + #include "mxm/factory/GB_AxB_compare_factory.c" break ; //---------------------------------------------------------------------- @@ -216,7 +216,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 55 semirings: (and,or,xor,eq,any) * 11 types (all but complex) #define GB_MNAME _ge - #include "GB_AxB_compare_factory.c" + #include "mxm/factory/GB_AxB_compare_factory.c" break ; //---------------------------------------------------------------------- @@ -225,7 +225,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 55 semirings: (and,or,xor,eq,any) * 11 types (all but complex) #define GB_MNAME _le - #include "GB_AxB_compare_factory.c" + #include "mxm/factory/GB_AxB_compare_factory.c" break ; //---------------------------------------------------------------------- @@ -239,7 +239,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; #define GB_MULT_IS_PAIR_OPERATOR #define GB_MNAME _pair #define GB_COMPLEX - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -251,7 +251,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 5 semirings: (lor,land,eq,lxor,any) for boolean #define GB_NO_MIN_MAX_ANY_TIMES_MONOIDS #define GB_MNAME _lor - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -261,7 +261,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 15 semirings: same as LOR #define GB_NO_MIN_MAX_ANY_TIMES_MONOIDS #define GB_MNAME _land - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -271,7 +271,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 15 semirings: same as LOR #define GB_NO_MIN_MAX_ANY_TIMES_MONOIDS #define GB_MNAME _lxor - #include "GB_AxB_type_factory.c" + #include "mxm/factory/GB_AxB_type_factory.c" break ; //---------------------------------------------------------------------- @@ -280,7 +280,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 16 semirings: (bor,band,bxor,bxnor) * (uint8,16,32,64) #define GB_MNAME _bor - #include "GB_AxB_bitwise_factory.c" + #include "mxm/factory/GB_AxB_bitwise_factory.c" break ; //---------------------------------------------------------------------- @@ -289,7 +289,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 16 semirings: (bor,band,bxor,bxnor) * (uint8,16,32,64) #define GB_MNAME _band - #include "GB_AxB_bitwise_factory.c" + #include "mxm/factory/GB_AxB_bitwise_factory.c" break ; //---------------------------------------------------------------------- @@ -298,7 +298,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 16 semirings: (bor,band,bxor,bxnor) * (uint8,16,32,64) #define GB_MNAME _bxor - #include "GB_AxB_bitwise_factory.c" + #include "mxm/factory/GB_AxB_bitwise_factory.c" break ; //---------------------------------------------------------------------- @@ -307,7 +307,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 16 semirings: (bor,band,bxor,bxnor) * (uint8,16,32,64) #define GB_MNAME _bxnor - #include "GB_AxB_bitwise_factory.c" + #include "mxm/factory/GB_AxB_bitwise_factory.c" break ; //---------------------------------------------------------------------- @@ -316,7 +316,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 10 semirings: (min,max,times,plus,any) * (int32,int64) #define GB_MNAME _firsti - #include "GB_AxB_positional_factory.c" + #include "mxm/factory/GB_AxB_positional_factory.c" break ; //---------------------------------------------------------------------- @@ -325,7 +325,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 10 semirings: (min,max,times,plus,any) * (int32,int64) #define GB_MNAME _firsti1 - #include "GB_AxB_positional_factory.c" + #include "mxm/factory/GB_AxB_positional_factory.c" break ; //---------------------------------------------------------------------- @@ -336,7 +336,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 10 semirings: (min,max,times,plus,any) * (int32,int64) // FIRSTJ and SECONDI are identical when used in a semiring #define GB_MNAME _firstj - #include "GB_AxB_positional_factory.c" + #include "mxm/factory/GB_AxB_positional_factory.c" break ; //---------------------------------------------------------------------- @@ -347,7 +347,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 10 semirings: (min,max,times,plus,any) * (int32,int64) // FIRSTJ1 and SECONDI1 are identical when used in a semiring #define GB_MNAME _firstj1 - #include "GB_AxB_positional_factory.c" + #include "mxm/factory/GB_AxB_positional_factory.c" break ; //---------------------------------------------------------------------- @@ -356,7 +356,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 10 semirings: (min,max,times,plus,any) * (int32,int64) #define GB_MNAME _secondj - #include "GB_AxB_positional_factory.c" + #include "mxm/factory/GB_AxB_positional_factory.c" break ; //---------------------------------------------------------------------- @@ -365,7 +365,7 @@ ASSERT (mult_binop_code != GB_ANY_binop_code) ; // 10 semirings: (min,max,times,plus,any) * (int32,int64) #define GB_MNAME _secondj1 - #include "GB_AxB_positional_factory.c" + #include "mxm/factory/GB_AxB_positional_factory.c" break ; default: ; diff --git a/GraphBLAS/Source/Factories/GB_AxB_positional_factory.c b/GraphBLAS/Source/mxm/factory/GB_AxB_positional_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_AxB_positional_factory.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_positional_factory.c diff --git a/GraphBLAS/Source/Factories/GB_AxB_saxpy3_symbolic_template.c b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy3_symbolic_template.c similarity index 93% rename from GraphBLAS/Source/Factories/GB_AxB_saxpy3_symbolic_template.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_saxpy3_symbolic_template.c index 111d76e254..77f93a8d36 100644 --- a/GraphBLAS/Source/Factories/GB_AxB_saxpy3_symbolic_template.c +++ b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy3_symbolic_template.c @@ -19,13 +19,13 @@ // The sparsity of A and B are #defined' constants for this method, // as is the 3 cases of the mask (no M, M, or !M). -#include "GB_AxB_saxpy3.h" -#include "GB_mxm_shared_definitions.h" -#include "GB_AxB_saxpy3_template.h" -#include "GB_unused.h" +#include "mxm/GB_AxB_saxpy3.h" +#include "mxm/include/GB_mxm_shared_definitions.h" +#include "mxm/include/GB_AxB_saxpy3_template.h" +#include "include/GB_unused.h" #define GB_META16 -#include "GB_meta16_definitions.h" +#include "mxm/include/GB_meta16_definitions.h" void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) ( @@ -245,17 +245,17 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) #if ( GB_NO_MASK ) { // phase1: coarse Gustavson task, C=A*B - #include "GB_AxB_saxpy3_coarseGus_noM_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseGus_noM_phase1.c" } #elif ( !GB_MASK_COMP ) { // phase1: coarse Gustavson task, C=A*B - #include "GB_AxB_saxpy3_coarseGus_M_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseGus_M_phase1.c" } #else { // phase1: coarse Gustavson task, C=A*B - #include "GB_AxB_saxpy3_coarseGus_notM_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseGus_notM_phase1.c" } #endif @@ -278,7 +278,7 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) //---------------------------------------------------------- #undef GB_CHECK_MASK_ij - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" } #elif ( !GB_MASK_COMP ) @@ -310,22 +310,22 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) #define M_TYPE uint8_t #undef M_SIZE #define M_SIZE 1 - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_2BYTE : #undef M_TYPE #define M_TYPE uint16_t - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_4BYTE : #undef M_TYPE #define M_TYPE uint32_t - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_8BYTE : #undef M_TYPE #define M_TYPE uint64_t - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_16BYTE : #undef M_TYPE @@ -340,7 +340,7 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) (Mjx [2*i] != 0) || \ (Mjx [2*i+1] != 0)) ; \ if (!mij) continue ; - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; } @@ -352,7 +352,7 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) // M is sparse and scattered into Hf //------------------------------------------------------ - #include "GB_AxB_saxpy3_coarseHash_M_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_M_phase1.c" } } @@ -385,22 +385,22 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) #define M_TYPE uint8_t #undef M_SIZE #define M_SIZE 1 - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_2BYTE : #undef M_TYPE #define M_TYPE uint16_t - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_4BYTE : #undef M_TYPE #define M_TYPE uint32_t - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_8BYTE : #undef M_TYPE #define M_TYPE uint64_t - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; case GB_16BYTE : #undef M_TYPE @@ -415,7 +415,7 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) (Mjx [2*i] != 0) || \ (Mjx [2*i+1] != 0)) ; \ if (mij) continue ; - #include "GB_AxB_saxpy3_coarseHash_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c" break ; } @@ -427,7 +427,7 @@ void GB_EVAL2 (GB (AxB_saxpy3_sym), GB_MASK_A_B_SUFFIX) // M is sparse and scattered into Hf //------------------------------------------------------ - #include "GB_AxB_saxpy3_coarseHash_notM_phase1.c" + #include "mxm/template/GB_AxB_saxpy3_coarseHash_notM_phase1.c" } } #endif diff --git a/GraphBLAS/Source/Factories/GB_AxB_saxpy5_meta.c b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy5_meta.c similarity index 92% rename from GraphBLAS/Source/Factories/GB_AxB_saxpy5_meta.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_saxpy5_meta.c index cc3d7e5f52..9a48d43859 100644 --- a/GraphBLAS/Source/Factories/GB_AxB_saxpy5_meta.c +++ b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy5_meta.c @@ -18,7 +18,7 @@ // This method is only used for built-in semirings with no typecasting, in // the FactoryKernels. It is not used for JIT kernels, but the JIT kernel -// (Source/JitKernels/GB_jit_kernel_AxB_saxpy5.c) has nearly identical logic. +// (Source/jit_kernels/GB_jit_kernel_AxB_saxpy5.c) has nearly identical logic. #ifdef GB_GENERIC #error "saxpy5 generic kernel undefined" @@ -64,14 +64,14 @@ // A is bitmap and pattern-only #undef GB_A_IS_BITMAP #define GB_A_IS_BITMAP 1 - #include "GB_AxB_saxpy5_A_iso_or_pattern.c" + #include "mxm/template/GB_AxB_saxpy5_A_iso_or_pattern.c" } else { // A is full and pattern-only #undef GB_A_IS_BITMAP #define GB_A_IS_BITMAP 0 - #include "GB_AxB_saxpy5_A_iso_or_pattern.c" + #include "mxm/template/GB_AxB_saxpy5_A_iso_or_pattern.c" } } @@ -94,14 +94,14 @@ // A is bitmap, iso-valued, B is sparse/hyper #undef GB_A_IS_BITMAP #define GB_A_IS_BITMAP 1 - #include "GB_AxB_saxpy5_A_iso_or_pattern.c" + #include "mxm/template/GB_AxB_saxpy5_A_iso_or_pattern.c" } else { // A is full, iso-valued, B is sparse/hyper #undef GB_A_IS_BITMAP #define GB_A_IS_BITMAP 0 - #include "GB_AxB_saxpy5_A_iso_or_pattern.c" + #include "mxm/template/GB_AxB_saxpy5_A_iso_or_pattern.c" } } @@ -117,7 +117,7 @@ // A is bitmap, non-iso-valued, B is sparse/hyper #undef GB_A_IS_BITMAP #define GB_A_IS_BITMAP 1 - #include "GB_AxB_saxpy5_A_bitmap.c" + #include "mxm/template/GB_AxB_saxpy5_A_bitmap.c" #undef GB_A_IS_BITMAP } else diff --git a/GraphBLAS/Source/Factories/GB_AxB_saxpy_generic_method.c b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy_generic_method.c similarity index 93% rename from GraphBLAS/Source/Factories/GB_AxB_saxpy_generic_method.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_saxpy_generic_method.c index d492d766f8..bc5df7b305 100644 --- a/GraphBLAS/Source/Factories/GB_AxB_saxpy_generic_method.c +++ b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy_generic_method.c @@ -56,15 +56,14 @@ //------------------------------------------------------------------------------ -#include "GB_AxB_saxpy.h" -#include "GB_ek_slice.h" -#include "GB_binop.h" -#include "GB_sort.h" -#include "GB_ek_slice_search.c" -#include "GB_bitmap_assign_methods.h" -#include "GB_mxm_shared_definitions.h" -#include "GB_AxB_saxpy_generic.h" -#include "GB_generic.h" +#include "mxm/GB_AxB_saxpy.h" +#include "slice/GB_ek_slice.h" +#include "binaryop/GB_binop.h" +#include "slice/factory/GB_ek_slice_search.c" +#include "assign/GB_bitmap_assign_methods.h" +#include "mxm/include/GB_mxm_shared_definitions.h" +#include "mxm/GB_AxB_saxpy_generic.h" +#include "generic/GB_generic.h" GrB_Info GB_AXB_SAXPY_GENERIC_METHOD ( @@ -161,7 +160,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD #define GB_B_SIZE bsize // definitions for GB_AxB_saxpy_generic_template.c - #include "GB_AxB_saxpy3_template.h" + #include "mxm/include/GB_AxB_saxpy3_template.h" #if GB_GENERIC_OP_IS_POSITIONAL { @@ -252,7 +251,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD // GB_FIRSTI1_binop_code : // z = first_i1(A(i,k),y) == i+1 #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) t = i + offset - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #elif GB_GENERIC_OP_IS_FIRSTJ { @@ -262,7 +261,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD // GB_SECONDI1_binop_code : // z = second_i1(x,B(k,j))== k+1 #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) t = k + offset - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #else { @@ -270,7 +269,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD // GB_SECONDJ1_binop_code : // z = second_j1(x,B(k,j))== j+1 #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) t = j + offset - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #endif } @@ -290,7 +289,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD // GB_FIRSTI1_binop_code : // z = first_i1(A(i,k),y) == i+1 #undef GB_MULT #define GB_MULT(t,aik,bkj,i,k,j) t = (int32_t) (i + offset) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #elif GB_GENERIC_OP_IS_FIRSTJ { @@ -300,7 +299,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD // GB_SECONDI1_binop_code : // z = second_i1(x,B(k,j))== k+1 #undef GB_MULT #define GB_MULT(t,aik,bkj,i,k,j) t = (int32_t) (k + offset) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #else { @@ -308,7 +307,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD // GB_SECONDJ1_binop_code : // z = second_j1(x,B(k,j))== j+1 #undef GB_MULT #define GB_MULT(t,aik,bkj,i,k,j) t = (int32_t) (j + offset) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #endif } @@ -405,7 +404,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD ASSERT (B_is_pattern) ; #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) memcpy (t, aik, csize) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #elif GB_GENERIC_OP_IS_SECOND { @@ -413,7 +412,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD ASSERT (A_is_pattern) ; #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) memcpy (t, bkj, csize) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #elif GB_GENERIC_FLIPXY { @@ -421,7 +420,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD ASSERT (fmult != NULL) ; #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) fmult (t, bkj, aik) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #else { @@ -429,7 +428,7 @@ GrB_Info GB_AXB_SAXPY_GENERIC_METHOD ASSERT (fmult != NULL) ; #undef GB_MULT #define GB_MULT(t, aik, bkj, i, k, j) fmult (t, aik, bkj) - #include "GB_AxB_saxpy_generic_template.c" + #include "mxm/factory/GB_AxB_saxpy_generic_template.c" } #endif } diff --git a/GraphBLAS/Source/Factories/GB_AxB_saxpy_generic_template.c b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy_generic_template.c similarity index 80% rename from GraphBLAS/Source/Factories/GB_AxB_saxpy_generic_template.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_saxpy_generic_template.c index 0c7d9575a9..a67965b82d 100644 --- a/GraphBLAS/Source/Factories/GB_AxB_saxpy_generic_template.c +++ b/GraphBLAS/Source/mxm/factory/GB_AxB_saxpy_generic_template.c @@ -10,7 +10,7 @@ // A and B matrices have any format: hypersparse, sparse, bitmap, or full. // C can be sparse, hypersparse, or bitmap, but not full. -#include "GB_mxm_shared_definitions.h" +#include "mxm/include/GB_mxm_shared_definitions.h" { #if GB_GENERIC_C_IS_SPARSE_OR_HYPERSPARSE @@ -22,27 +22,27 @@ // C = A*B, no mask #define GB_NO_MASK 1 #define GB_MASK_COMP 0 - #include "GB_AxB_saxpy3_template.c" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else if (!Mask_comp) { // C = A*B #define GB_NO_MASK 0 #define GB_MASK_COMP 0 - #include "GB_AxB_saxpy3_template.c" + #include "mxm/template/GB_AxB_saxpy3_template.c" } else { // C = A*B #define GB_NO_MASK 0 #define GB_MASK_COMP 1 - #include "GB_AxB_saxpy3_template.c" + #include "mxm/template/GB_AxB_saxpy3_template.c" } } #else { // C is bitmap - #include "GB_AxB_saxbit_template.c" + #include "mxm/template/GB_AxB_saxbit_template.c" } #endif } diff --git a/GraphBLAS/Source/Factories/GB_AxB_type_factory.c b/GraphBLAS/Source/mxm/factory/GB_AxB_type_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_AxB_type_factory.c rename to GraphBLAS/Source/mxm/factory/GB_AxB_type_factory.c diff --git a/GraphBLAS/Source/Template/GB_AxB_dot_cij.h b/GraphBLAS/Source/mxm/include/GB_AxB_dot_cij.h similarity index 93% rename from GraphBLAS/Source/Template/GB_AxB_dot_cij.h rename to GraphBLAS/Source/mxm/include/GB_AxB_dot_cij.h index 2da066bd0f..e9bb1b28fd 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot_cij.h +++ b/GraphBLAS/Source/mxm/include/GB_AxB_dot_cij.h @@ -7,9 +7,10 @@ //------------------------------------------------------------------------------ -// The GB_AxB_dot_cij.c method is used only by Template/GB_AxB_dot2_template.c -// and Template/GB_AxB_dot3_template.c. That method declares the cij scalar, -// and initializes it to zero for the PLUS_PAIR_REAL semiring. +// The GB_AxB_dot_cij.c method is used only by +// mxm/template/GB_AxB_dot2_template.c and mxm/template/GB_AxB_dot3_template.c. +// That method declares the cij scalar, and initializes it to zero for the +// PLUS_PAIR_REAL semiring. // GB_DOT: cij += (A(k,i) or A(i,k)) * B(k,j), then break if terminal // Ai [pA] and Bi [pB] are both equal to the index k. @@ -17,7 +18,7 @@ // GB_AxB_dot2, with A_not_transposed where it points to A(i,k). // The #include'ing file must use GB_DECLARE_TERMINAL_CONST (zterminal), -// or define zterminal another way (see Template/GB_AxB_dot_generic.c). +// or define zterminal another way (see mxm/template/GB_AxB_dot_generic.c). // use the boolean flag cij_exists to set/check if C(i,j) exists #undef GB_CIJ_CHECK @@ -33,7 +34,8 @@ //-------------------------------------------------------------------------- // this method requires that cij = 0 be initialized when it is declared. - // See Template/GB_AxB_dot2_template.c and Template/GB_AxB_dot3_template.c + // See mxm/template/GB_AxB_dot2_template.c and + // mxm/template/GB_AxB_dot3_template.c #if GB_Z_IGNORE_OVERFLOW diff --git a/GraphBLAS/Source/Template/GB_AxB_macros.h b/GraphBLAS/Source/mxm/include/GB_AxB_macros.h similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_macros.h rename to GraphBLAS/Source/mxm/include/GB_AxB_macros.h diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_template.h b/GraphBLAS/Source/mxm/include/GB_AxB_saxpy3_template.h similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_template.h rename to GraphBLAS/Source/mxm/include/GB_AxB_saxpy3_template.h index 869dc51921..c70fc1247e 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxpy3_template.h +++ b/GraphBLAS/Source/mxm/include/GB_AxB_saxpy3_template.h @@ -599,7 +599,7 @@ #undef GB_META16 #endif -#include "GB_meta16_definitions.h" +#include "include/GB_meta16_definitions.h" #endif diff --git a/GraphBLAS/Source/Template/GB_meta16_definitions.h b/GraphBLAS/Source/mxm/include/GB_meta16_definitions.h similarity index 100% rename from GraphBLAS/Source/Template/GB_meta16_definitions.h rename to GraphBLAS/Source/mxm/include/GB_meta16_definitions.h diff --git a/GraphBLAS/Source/Shared/GB_mxm_shared_definitions.h b/GraphBLAS/Source/mxm/include/GB_mxm_shared_definitions.h similarity index 99% rename from GraphBLAS/Source/Shared/GB_mxm_shared_definitions.h rename to GraphBLAS/Source/mxm/include/GB_mxm_shared_definitions.h index 54ea3af76e..3f1ba54378 100644 --- a/GraphBLAS/Source/Shared/GB_mxm_shared_definitions.h +++ b/GraphBLAS/Source/mxm/include/GB_mxm_shared_definitions.h @@ -12,7 +12,7 @@ // file. This file is shared by generic, pre-generated, and both CPU and CUDA // JIT kernels. -#include "GB_monoid_shared_definitions.h" +#include "include/GB_monoid_shared_definitions.h" #ifndef GB_MXM_SHARED_DEFINITIONS_H #define GB_MXM_SHARED_DEFINITIONS_H diff --git a/GraphBLAS/Source/Template/GB_saxpy3task_struct.h b/GraphBLAS/Source/mxm/include/GB_saxpy3task_struct.h similarity index 100% rename from GraphBLAS/Source/Template/GB_saxpy3task_struct.h rename to GraphBLAS/Source/mxm/include/GB_saxpy3task_struct.h diff --git a/GraphBLAS/Source/Template/GB_AxB_dot2_meta.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot2_meta.c similarity index 93% rename from GraphBLAS/Source/Template/GB_AxB_dot2_meta.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot2_meta.c index f09a3b3b05..32532da4fa 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot2_meta.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot2_meta.c @@ -9,8 +9,8 @@ #define GB_DOT2 -#include "GB_unused.h" -#include "GB_AxB_dot_cij.h" +#include "include/GB_unused.h" +#include "include/GB_AxB_dot_cij.h" { @@ -100,8 +100,8 @@ GB_DECLARE_TERMINAL_CONST (zterminal) ; #define GB_META16 - #include "GB_meta16_definitions.h" - #include "GB_AxB_dot2_template.c" + #include "include/GB_meta16_definitions.h" + #include "template/GB_AxB_dot2_template.c" #else @@ -139,7 +139,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } else if (A_is_bitmap) { @@ -155,7 +155,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } else { @@ -171,7 +171,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } #undef GB_A_NOT_TRANSPOSED } @@ -192,7 +192,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } else if (A_is_full) { @@ -206,7 +206,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } else { @@ -221,7 +221,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } #undef GB_C_IS_FULL #define GB_C_IS_FULL 0 @@ -230,7 +230,7 @@ { // C = A'*B, via dot2 method, where A is implicitly transposed, // C is bitmap - #include "GB_meta16_factory.c" + #include "template/GB_meta16_factory.c" } } @@ -287,7 +287,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" #undef GB_ANY_SPECIALIZED } @@ -320,7 +320,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } else { @@ -333,14 +333,14 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" } #undef GB_A_NOT_TRANSPOSED } else { // C<#>M = A'*B, via dot2 method, A is implicitly transposed - #include "GB_meta16_factory.c" + #include "template/GB_meta16_factory.c" } } } diff --git a/GraphBLAS/Source/Template/GB_AxB_dot2_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot2_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_dot2_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot2_template.c index ceff7b64fd..c8616e197d 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot2_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot2_template.c @@ -212,7 +212,7 @@ #if GB_IS_PLUS_PAIR_REAL_SEMIRING cij = 0 ; #endif - #include "GB_AxB_dot_cij.c" + #include "template/GB_AxB_dot_cij.c" } } } diff --git a/GraphBLAS/Source/Template/GB_AxB_dot3_meta.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot3_meta.c similarity index 94% rename from GraphBLAS/Source/Template/GB_AxB_dot3_meta.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot3_meta.c index 7308d4b34d..2d3a832356 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot3_meta.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot3_meta.c @@ -8,15 +8,15 @@ //------------------------------------------------------------------------------ // This template is #include'd in 3 ways to construct: -// * a generic method: Template/GB_AxB_dot_generic.c) +// * a generic method: mxm/factory/GB_AxB_dot_generic.c // * a Factory method: FactoryKernels/GB_AxB_*, the Adot3B method -// * a JIT kernel: JitKernels/GB_jit_kernel_AxB_dot3.c +// * a JIT kernel: jit_kernels/GB_jit_kernel_AxB_dot3.c #define GB_DOT3 #define GB_DOT3_PHASE2 -#include "GB_unused.h" -#include "GB_AxB_dot_cij.h" +#include "include/GB_unused.h" +#include "include/GB_AxB_dot_cij.h" // GB_DOT_ALWAYS_SAVE_CIJ: C(i,j) = cij #if GB_CIJ_CHECK @@ -154,8 +154,8 @@ { GB_DECLARE_TERMINAL_CONST (zterminal) ; #define GB_META16 - #include "GB_meta16_definitions.h" - #include "GB_AxB_dot3_template.c" + #include "include/GB_meta16_definitions.h" + #include "template/GB_AxB_dot3_template.c" } #else { @@ -174,14 +174,14 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_AxB_dot3_template.c" + #include "template/GB_AxB_dot3_template.c" #undef GB_MASK_SPARSE_STRUCTURAL_AND_NOT_COMPLEMENTED } else { // general case const size_t msize = M->type->size ; - #include "GB_meta16_factory.c" + #include "template/GB_meta16_factory.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_AxB_dot3_phase1_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot3_phase1_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_dot3_phase1_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot3_phase1_template.c diff --git a/GraphBLAS/Source/Template/GB_AxB_dot3_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot3_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_dot3_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot3_template.c index d9cdb407d3..d60d2f2cfd 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot3_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot3_template.c @@ -152,7 +152,7 @@ #endif { // C(i,j) = A(:,i)'*B(:,j) - #include "GB_AxB_dot_cij.c" + #include "template/GB_AxB_dot_cij.c" } } diff --git a/GraphBLAS/Source/Template/GB_AxB_dot4_cij.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot4_cij.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_dot4_cij.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot4_cij.c diff --git a/GraphBLAS/Source/Template/GB_AxB_dot4_meta.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot4_meta.c similarity index 96% rename from GraphBLAS/Source/Template/GB_AxB_dot4_meta.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot4_meta.c index 422ef700eb..b6b535f422 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot4_meta.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot4_meta.c @@ -111,10 +111,10 @@ #ifdef GB_JIT_KERNEL #define GB_META16 - #include "GB_meta16_definitions.h" - #include "GB_AxB_dot4_template.c" + #include "include/GB_meta16_definitions.h" + #include "template/GB_AxB_dot4_template.c" #else - #include "GB_meta16_factory.c" + #include "template/GB_meta16_factory.c" #endif } diff --git a/GraphBLAS/Source/Template/GB_AxB_dot4_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot4_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_dot4_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot4_template.c index 5ad4c95318..443c2859ee 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot4_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot4_template.c @@ -396,7 +396,7 @@ const int64_t pA_end = Ap [kA+1] ; const int64_t ainz = pA_end - pA ; // C(i) += A(:,i)'*B(:,0) - #include "GB_AxB_dot4_cij.c" + #include "template/GB_AxB_dot4_cij.c" } #undef pC_start #undef pB @@ -428,7 +428,7 @@ const int64_t pC_start = j * cvlen ; const int64_t pB = j * vlen ; // C(i,j) += A(:,i)'*B(:,j) - #include "GB_AxB_dot4_cij.c" + #include "template/GB_AxB_dot4_cij.c" } } } diff --git a/GraphBLAS/Source/Template/GB_AxB_dot_cij.c b/GraphBLAS/Source/mxm/template/GB_AxB_dot_cij.c similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_dot_cij.c rename to GraphBLAS/Source/mxm/template/GB_AxB_dot_cij.c index d9dd0bc46c..eba5cb390c 100644 --- a/GraphBLAS/Source/Template/GB_AxB_dot_cij.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_dot_cij.c @@ -31,7 +31,7 @@ // entirely populated. // The #include'ing file must use GB_DECLARE_TERMINAL_CONST (zterminal), -// or define zterminal another way (see Template/GB_AxB_dot_generic.c). +// or define zterminal another way (see mxm/factory/GB_AxB_dot_generic.c). #ifndef GB_MXM_SHARED_DEFINITIONS_H #error "undefined" diff --git a/GraphBLAS/Source/Template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c index b50af16053..568af03873 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c @@ -12,7 +12,7 @@ // no accumulator is used -// This template is used by Template/GB_AxB_saxbit_template, for all cases: +// This template is used by mxm/template/GB_AxB_saxbit_template, for all cases: // generic kernels, factory kernels (including the ANY_PAIR monoid), and JIT // kernels. @@ -148,7 +148,7 @@ } \ } - #include "GB_AxB_saxpy4_panel.c" + #include "template/GB_AxB_saxpy4_panel.c" #undef GB_MULT_A_ik_G_kj #undef GB_HX_COMPUTE #undef GB_B_kj_PRESENT diff --git a/GraphBLAS/Source/Template/GB_AxB_saxbit_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxbit_template.c similarity index 94% rename from GraphBLAS/Source/Template/GB_AxB_saxbit_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxbit_template.c index 2e1e3c226b..e71257ee73 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxbit_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_saxbit_template.c @@ -174,11 +174,11 @@ #if ( GB_A_IS_SPARSE || GB_A_IS_HYPER ) { - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } #else { - #include "GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" } #endif @@ -237,14 +237,14 @@ // A is sparse/hyper, B is bitmap, no mask #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 1 - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } else { // A is sparse/hyper, B is full, no mask #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 0 - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } #undef GB_MASK_IS_SPARSE_OR_HYPER #undef GB_MASK_IS_BITMAP_OR_FULL @@ -268,14 +268,14 @@ // A is sparse/hyper, B is bitmap, M is sparse/hyper #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 1 - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } else { // A is sparse/hyper, B is full, M is sparse/hyper #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 0 - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } #undef GB_MASK_IS_SPARSE_OR_HYPER #undef GB_MASK_IS_BITMAP_OR_FULL @@ -297,14 +297,14 @@ // A is sparse/hyper, B is bitmap, M is bitmap/full #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 1 - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } else { // A is sparse/hyper, B is full, M is bitmap/full #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 0 - #include "GB_AxB_saxbit_A_sparse_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c" } #undef GB_MASK_IS_SPARSE_OR_HYPER #undef GB_MASK_IS_BITMAP_OR_FULL @@ -355,7 +355,7 @@ #define GB_MASK_IS_BITMAP_OR_FULL 0 #undef keep #define keep 1 - #include "GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" #undef GB_MASK_IS_SPARSE_OR_HYPER #undef GB_MASK_IS_BITMAP_OR_FULL @@ -371,7 +371,7 @@ #define GB_MASK_IS_BITMAP_OR_FULL 0 #undef keep const int8_t keep = (Mask_comp) ? 1 : 3 ; - #include "GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" #undef GB_MASK_IS_SPARSE_OR_HYPER #undef GB_MASK_IS_BITMAP_OR_FULL @@ -387,7 +387,7 @@ #define GB_MASK_IS_BITMAP_OR_FULL 1 #undef keep #define keep 1 - #include "GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" + #include "template/GB_AxB_saxbit_A_bitmap_B_bitmap_template.c" #undef GB_MASK_IS_SPARSE_OR_HYPER #undef GB_MASK_IS_BITMAP_OR_FULL } diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_M_phase1.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_M_phase1.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_M_phase1.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_M_phase1.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_M_phase5.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_M_phase5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_M_phase5.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_M_phase5.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_noM_phase1.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_noM_phase1.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_noM_phase1.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_noM_phase1.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_noM_phase5.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_noM_phase5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_noM_phase5.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_noM_phase5.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_notM_phase1.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_notM_phase1.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_notM_phase1.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_notM_phase1.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_notM_phase5.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_notM_phase5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseGus_notM_phase5.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseGus_notM_phase5.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_M_phase1.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_M_phase1.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_M_phase1.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_M_phase1.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_M_phase5.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_M_phase5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_M_phase5.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_M_phase5.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_notM_phase1.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_notM_phase1.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_notM_phase1.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_notM_phase1.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_notM_phase5.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_notM_phase5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_notM_phase5.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_notM_phase5.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_phase1.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_phase1.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_phase1.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_phase5.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_phase5.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_coarseHash_phase5.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_coarseHash_phase5.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_fineGus_M_phase2.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineGus_M_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_fineGus_M_phase2.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineGus_M_phase2.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_fineGus_notM_phase2.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineGus_notM_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_fineGus_notM_phase2.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineGus_notM_phase2.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_fineGus_phase2.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineGus_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_fineGus_phase2.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineGus_phase2.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_fineHash_M_phase2.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineHash_M_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_fineHash_M_phase2.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineHash_M_phase2.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_fineHash_notM_phase2.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineHash_notM_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_fineHash_notM_phase2.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineHash_notM_phase2.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_fineHash_phase2.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineHash_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_fineHash_phase2.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_fineHash_phase2.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy3_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_template.c similarity index 93% rename from GraphBLAS/Source/Template/GB_AxB_saxpy3_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_template.c index cac0998879..2efb196f52 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxpy3_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy3_template.c @@ -10,7 +10,7 @@ // GB_AxB_saxpy3_template.c computes C=A*B for any semiring and matrix types, // where C is sparse or hypersparse. -#include "GB_unused.h" +#include "include/GB_unused.h" //------------------------------------------------------------------------------ // template code for C=A*B via the saxpy3 method @@ -172,17 +172,17 @@ #if ( GB_NO_MASK ) { // phase2: fine Gustavson task, C(:,j)=A*B(:,j) - #include "GB_AxB_saxpy3_fineGus_phase2.c" + #include "template/GB_AxB_saxpy3_fineGus_phase2.c" } #elif ( !GB_MASK_COMP ) { // phase2: fine Gustavson task, C(:,j)=A*B(:,j) - #include "GB_AxB_saxpy3_fineGus_M_phase2.c" + #include "template/GB_AxB_saxpy3_fineGus_M_phase2.c" } #else { // phase2: fine Gustavson task, C(:,j)=A*B(:,j) - #include "GB_AxB_saxpy3_fineGus_notM_phase2.c" + #include "template/GB_AxB_saxpy3_fineGus_notM_phase2.c" } #endif @@ -230,7 +230,7 @@ // no mask present, or mask ignored #undef GB_CHECK_MASK_ij - #include "GB_AxB_saxpy3_fineHash_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_phase2.c" } #elif ( !GB_MASK_COMP ) @@ -251,7 +251,7 @@ #undef GB_CHECK_MASK_ij #define GB_CHECK_MASK_ij \ if (!Mjb [i]) continue ; - #include "GB_AxB_saxpy3_fineHash_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_phase2.c" } else { @@ -261,13 +261,13 @@ const int64_t pM = pM_start + i ; \ GB_GET_M_ij (pM) ; \ if (!mij) continue ; - #include "GB_AxB_saxpy3_fineHash_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_phase2.c" } } else { // M(:,j) is sparse and scattered into Hf - #include "GB_AxB_saxpy3_fineHash_M_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_M_phase2.c" } } @@ -289,7 +289,7 @@ #undef GB_CHECK_MASK_ij #define GB_CHECK_MASK_ij \ if (Mjb [i]) continue ; - #include "GB_AxB_saxpy3_fineHash_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_phase2.c" } else { @@ -299,13 +299,13 @@ const int64_t pM = pM_start + i ; \ GB_GET_M_ij (pM) ; \ if (mij) continue ; - #include "GB_AxB_saxpy3_fineHash_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_phase2.c" } } else { // M(:,j) is sparse/hyper and scattered into Hf - #include "GB_AxB_saxpy3_fineHash_notM_phase2.c" + #include "template/GB_AxB_saxpy3_fineHash_notM_phase2.c" } } #endif @@ -472,17 +472,17 @@ #if ( GB_NO_MASK ) { // phase5: coarse Gustavson task, C=A*B - #include "GB_AxB_saxpy3_coarseGus_noM_phase5.c" + #include "template/GB_AxB_saxpy3_coarseGus_noM_phase5.c" } #elif ( !GB_MASK_COMP ) { // phase5: coarse Gustavson task, C=A*B - #include "GB_AxB_saxpy3_coarseGus_M_phase5.c" + #include "template/GB_AxB_saxpy3_coarseGus_M_phase5.c" } #else { // phase5: coarse Gustavson task, C=A*B - #include "GB_AxB_saxpy3_coarseGus_notM_phase5.c" + #include "template/GB_AxB_saxpy3_coarseGus_notM_phase5.c" } #endif @@ -506,7 +506,7 @@ // no mask present, or mask ignored (see below) #undef GB_CHECK_MASK_ij - #include "GB_AxB_saxpy3_coarseHash_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_phase5.c" } #elif ( !GB_MASK_COMP ) @@ -526,7 +526,7 @@ #undef GB_CHECK_MASK_ij #define GB_CHECK_MASK_ij \ if (!Mjb [i]) continue ; - #include "GB_AxB_saxpy3_coarseHash_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_phase5.c" } else { @@ -536,13 +536,13 @@ const int64_t pM = pM_start + i ; \ GB_GET_M_ij (pM) ; \ if (!mij) continue ; - #include "GB_AxB_saxpy3_coarseHash_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_phase5.c" } } else { // M is sparse and scattered into Hf - #include "GB_AxB_saxpy3_coarseHash_M_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_M_phase5.c" } } @@ -563,7 +563,7 @@ #undef GB_CHECK_MASK_ij #define GB_CHECK_MASK_ij \ if (Mjb [i]) continue ; - #include "GB_AxB_saxpy3_coarseHash_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_phase5.c" } else { @@ -573,13 +573,13 @@ const int64_t pM = pM_start + i ; \ GB_GET_M_ij (pM) ; \ if (mij) continue ; - #include "GB_AxB_saxpy3_coarseHash_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_phase5.c" } } else { // M is sparse and scattered into Hf - #include "GB_AxB_saxpy3_coarseHash_notM_phase5.c" + #include "template/GB_AxB_saxpy3_coarseHash_notM_phase5.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy4_meta.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_meta.c similarity index 96% rename from GraphBLAS/Source/Template/GB_AxB_saxpy4_meta.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_meta.c index 011aaa1c78..d581211daa 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxpy4_meta.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_meta.c @@ -89,14 +89,14 @@ // A is sparse/hyper, B is bitmap, no mask #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 1 - #include "GB_AxB_saxpy4_template.c" + #include "template/GB_AxB_saxpy4_template.c" } else { // A is sparse/hyper, B is full, no mask #undef GB_B_IS_BITMAP #define GB_B_IS_BITMAP 0 - #include "GB_AxB_saxpy4_template.c" + #include "template/GB_AxB_saxpy4_template.c" } #undef GB_B_IS_BITMAP } diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy4_panel.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_panel.c similarity index 93% rename from GraphBLAS/Source/Template/GB_AxB_saxpy4_panel.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_panel.c index c19755af96..25d4095848 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxpy4_panel.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_panel.c @@ -7,11 +7,11 @@ //------------------------------------------------------------------------------ -// This methods handles both C bitmap (Template/GB_AxB_saxpy4_panel.c) and C -// full (Template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c). Those methods -// define the GB_HX_COMPUTE macro for use in this method, which computes the -// single update: H (i,jj) += A(i,k) * B(k,j). The values of B have already -// been loaded into the panel G. +// This methods handles both C bitmap (mxm/template/GB_AxB_saxpy4_panel.c) and +// C full (mxm/template/GB_AxB_saxbit_A_sparse_B_bitmap_template.c). Those +// methods define the GB_HX_COMPUTE macro for use in this method, which +// computes the single update: H (i,jj) += A(i,k) * B(k,j). The values of B +// have already been loaded into the panel G. { switch (np) diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy4_template.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_AxB_saxpy4_template.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_template.c index 2599378f22..8e8bcbda21 100644 --- a/GraphBLAS/Source/Template/GB_AxB_saxpy4_template.c +++ b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy4_template.c @@ -11,7 +11,7 @@ // C += A*B is computed with the accumulator identical to the monoid. -// This template is used by Template/GB_AxB_saxpy4_meta. It is not used +// This template is used by mxm/template/GB_AxB_saxpy4_meta. It is not used // for the generic case, nor for the ANY_PAIR case. It is only used for the // pre-generated kernels, and for the JIT. @@ -136,7 +136,7 @@ } #endif - #include "GB_AxB_saxpy4_panel.c" + #include "template/GB_AxB_saxpy4_panel.c" #undef GB_HX_COMPUTE //-------------------------------------------------------------- diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy5_A_bitmap.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy5_A_bitmap.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy5_A_bitmap.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy5_A_bitmap.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy5_A_iso_or_pattern.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy5_A_iso_or_pattern.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy5_A_iso_or_pattern.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy5_A_iso_or_pattern.c diff --git a/GraphBLAS/Source/Template/GB_AxB_saxpy5_unrolled.c b/GraphBLAS/Source/mxm/template/GB_AxB_saxpy5_unrolled.c similarity index 100% rename from GraphBLAS/Source/Template/GB_AxB_saxpy5_unrolled.c rename to GraphBLAS/Source/mxm/template/GB_AxB_saxpy5_unrolled.c diff --git a/GraphBLAS/Source/Template/GB_colscale_template.c b/GraphBLAS/Source/mxm/template/GB_colscale_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_colscale_template.c rename to GraphBLAS/Source/mxm/template/GB_colscale_template.c diff --git a/GraphBLAS/Source/Template/GB_meta16_factory.c b/GraphBLAS/Source/mxm/template/GB_meta16_factory.c similarity index 91% rename from GraphBLAS/Source/Template/GB_meta16_factory.c rename to GraphBLAS/Source/mxm/template/GB_meta16_factory.c index 6b38fa1216..e1bee825da 100644 --- a/GraphBLAS/Source/Template/GB_meta16_factory.c +++ b/GraphBLAS/Source/mxm/template/GB_meta16_factory.c @@ -30,7 +30,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_hyper) @@ -48,7 +48,7 @@ #define GB_B_IS_HYPER 1 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_bitmap) @@ -66,7 +66,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else @@ -84,7 +84,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } } @@ -105,7 +105,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_hyper) @@ -123,7 +123,7 @@ #define GB_B_IS_HYPER 1 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_bitmap) @@ -141,7 +141,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else @@ -159,7 +159,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } } @@ -180,7 +180,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_hyper) @@ -198,7 +198,7 @@ #define GB_B_IS_HYPER 1 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_bitmap) @@ -216,7 +216,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else @@ -234,7 +234,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } } @@ -255,7 +255,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_hyper) @@ -273,7 +273,7 @@ #define GB_B_IS_HYPER 1 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else if (B_is_bitmap) @@ -291,7 +291,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 1 #define GB_B_IS_FULL 0 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } else @@ -309,7 +309,7 @@ #define GB_B_IS_HYPER 0 #define GB_B_IS_BITMAP 0 #define GB_B_IS_FULL 1 - #include "GB_meta16_methods.c" + #include "template/GB_meta16_methods.c" } } @@ -320,5 +320,5 @@ //------------------------------------------------------------------------------ #undef GB_META16 -#include "GB_meta16_definitions.h" +#include "include/GB_meta16_definitions.h" diff --git a/GraphBLAS/Source/Template/GB_meta16_methods.c b/GraphBLAS/Source/mxm/template/GB_meta16_methods.c similarity index 79% rename from GraphBLAS/Source/Template/GB_meta16_methods.c rename to GraphBLAS/Source/mxm/template/GB_meta16_methods.c index 57d7a0ab0a..ab2d03f291 100644 --- a/GraphBLAS/Source/Template/GB_meta16_methods.c +++ b/GraphBLAS/Source/mxm/template/GB_meta16_methods.c @@ -10,17 +10,17 @@ { // declare macros that depend on the sparsity of A and B - #include "GB_meta16_definitions.h" + #include "include/GB_meta16_definitions.h" // dot product methods #if defined ( GB_DOT4 ) - #include "GB_AxB_dot4_template.c" + #include "template/GB_AxB_dot4_template.c" #elif defined ( GB_DOT3_PHASE1 ) - #include "GB_AxB_dot3_phase1_template.c" + #include "template/GB_AxB_dot3_phase1_template.c" #elif defined ( GB_DOT3_PHASE2 ) - #include "GB_AxB_dot3_template.c" + #include "template/GB_AxB_dot3_template.c" #elif defined ( GB_DOT2 ) - #include "GB_AxB_dot2_template.c" + #include "template/GB_AxB_dot2_template.c" #else #error "method undefined" diff --git a/GraphBLAS/Source/Template/GB_rowscale_template.c b/GraphBLAS/Source/mxm/template/GB_rowscale_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_rowscale_template.c rename to GraphBLAS/Source/mxm/template/GB_rowscale_template.c diff --git a/GraphBLAS/Source/GB_nnz.c b/GraphBLAS/Source/nvals/GB_nnz.c similarity index 100% rename from GraphBLAS/Source/GB_nnz.c rename to GraphBLAS/Source/nvals/GB_nnz.c diff --git a/GraphBLAS/Source/GB_nnz.h b/GraphBLAS/Source/nvals/GB_nnz.h similarity index 100% rename from GraphBLAS/Source/GB_nnz.h rename to GraphBLAS/Source/nvals/GB_nnz.h diff --git a/GraphBLAS/Source/GB_nnz_full.c b/GraphBLAS/Source/nvals/GB_nnz_full.c similarity index 100% rename from GraphBLAS/Source/GB_nnz_full.c rename to GraphBLAS/Source/nvals/GB_nnz_full.c diff --git a/GraphBLAS/Source/GB_nnz_held.c b/GraphBLAS/Source/nvals/GB_nnz_held.c similarity index 100% rename from GraphBLAS/Source/GB_nnz_held.c rename to GraphBLAS/Source/nvals/GB_nnz_held.c diff --git a/GraphBLAS/Source/GB_nnz_max.c b/GraphBLAS/Source/nvals/GB_nnz_max.c similarity index 100% rename from GraphBLAS/Source/GB_nnz_max.c rename to GraphBLAS/Source/nvals/GB_nnz_max.c diff --git a/GraphBLAS/Source/GB_nvals.c b/GraphBLAS/Source/nvals/GB_nvals.c similarity index 100% rename from GraphBLAS/Source/GB_nvals.c rename to GraphBLAS/Source/nvals/GB_nvals.c diff --git a/GraphBLAS/Source/GB_nvals.h b/GraphBLAS/Source/nvals/GB_nvals.h similarity index 100% rename from GraphBLAS/Source/GB_nvals.h rename to GraphBLAS/Source/nvals/GB_nvals.h diff --git a/GraphBLAS/Source/GrB_Matrix_nvals.c b/GraphBLAS/Source/nvals/GrB_Matrix_nvals.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_nvals.c rename to GraphBLAS/Source/nvals/GrB_Matrix_nvals.c diff --git a/GraphBLAS/Source/GrB_Scalar_nvals.c b/GraphBLAS/Source/nvals/GrB_Scalar_nvals.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_nvals.c rename to GraphBLAS/Source/nvals/GrB_Scalar_nvals.c diff --git a/GraphBLAS/Source/GrB_Vector_nvals.c b/GraphBLAS/Source/nvals/GrB_Vector_nvals.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_nvals.c rename to GraphBLAS/Source/nvals/GrB_Vector_nvals.c diff --git a/GraphBLAS/Source/GB_assert.h b/GraphBLAS/Source/ok/GB_assert.h similarity index 100% rename from GraphBLAS/Source/GB_assert.h rename to GraphBLAS/Source/ok/GB_assert.h diff --git a/GraphBLAS/Source/GB_ok.h b/GraphBLAS/Source/ok/GB_ok.h similarity index 100% rename from GraphBLAS/Source/GB_ok.h rename to GraphBLAS/Source/ok/GB_ok.h diff --git a/GraphBLAS/Source/Template/GB_assert_kernels.h b/GraphBLAS/Source/ok/include/GB_assert_kernels.h similarity index 100% rename from GraphBLAS/Source/Template/GB_assert_kernels.h rename to GraphBLAS/Source/ok/include/GB_assert_kernels.h diff --git a/GraphBLAS/Source/GB_omp.c b/GraphBLAS/Source/omp/GB_omp.c similarity index 100% rename from GraphBLAS/Source/GB_omp.c rename to GraphBLAS/Source/omp/GB_omp.c diff --git a/GraphBLAS/Source/GB_omp.h b/GraphBLAS/Source/omp/GB_omp.h similarity index 100% rename from GraphBLAS/Source/GB_omp.h rename to GraphBLAS/Source/omp/GB_omp.h diff --git a/GraphBLAS/Source/Template/GB_atomics.h b/GraphBLAS/Source/omp/include/GB_atomics.h similarity index 97% rename from GraphBLAS/Source/Template/GB_atomics.h rename to GraphBLAS/Source/omp/include/GB_atomics.h index 1b846f2ce7..94535663fb 100644 --- a/GraphBLAS/Source/Template/GB_atomics.h +++ b/GraphBLAS/Source/omp/include/GB_atomics.h @@ -384,17 +384,6 @@ // Type punning is used to extend these signed integer types to unsigned // integers of the same number of bytes, and to float and double. -//------------------------------------------------------------------------------ -// GB_PUN: type punning -//------------------------------------------------------------------------------ - -// With type punning, a value is treated as a different type, but with no -// typecasting. The address of the variable is first typecasted to a (type *) -// pointer, and then the pointer is dereferenced. - -#undef GB_PUN -#define GB_PUN(type,value) (*((type *) (&(value)))) - #if GB_COMPILER_MSC //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Source/Shared/GB_kernel_shared_definitions.h b/GraphBLAS/Source/omp/include/GB_kernel_shared_definitions.h similarity index 98% rename from GraphBLAS/Source/Shared/GB_kernel_shared_definitions.h rename to GraphBLAS/Source/omp/include/GB_kernel_shared_definitions.h index fd673822ce..9fea24955e 100644 --- a/GraphBLAS/Source/Shared/GB_kernel_shared_definitions.h +++ b/GraphBLAS/Source/omp/include/GB_kernel_shared_definitions.h @@ -10,8 +10,8 @@ // This header is #include'd just before using any templates for any method: // pre-generated kernel, CPU or GPU JIT, or generic. -#include "GB_unused.h" -#include "GB_complex.h" +#include "include/GB_unused.h" +#include "include/GB_complex.h" #ifndef GB_KERNEL_SHARED_DEFINITIONS_H #define GB_KERNEL_SHARED_DEFINITIONS_H diff --git a/GraphBLAS/Source/Template/GB_nthreads.h b/GraphBLAS/Source/omp/include/GB_nthreads.h similarity index 100% rename from GraphBLAS/Source/Template/GB_nthreads.h rename to GraphBLAS/Source/omp/include/GB_nthreads.h diff --git a/GraphBLAS/Source/Template/GB_omp_kernels.h b/GraphBLAS/Source/omp/include/GB_omp_kernels.h similarity index 100% rename from GraphBLAS/Source/Template/GB_omp_kernels.h rename to GraphBLAS/Source/omp/include/GB_omp_kernels.h diff --git a/GraphBLAS/Source/GB_Op_free.c b/GraphBLAS/Source/op/GB_Op_free.c similarity index 100% rename from GraphBLAS/Source/GB_Op_free.c rename to GraphBLAS/Source/op/GB_Op_free.c diff --git a/GraphBLAS/Source/GB_op.h b/GraphBLAS/Source/op/GB_op.h similarity index 100% rename from GraphBLAS/Source/GB_op.h rename to GraphBLAS/Source/op/GB_op.h diff --git a/GraphBLAS/Source/GB_op_is_second.c b/GraphBLAS/Source/op/GB_op_is_second.c similarity index 100% rename from GraphBLAS/Source/GB_op_is_second.c rename to GraphBLAS/Source/op/GB_op_is_second.c diff --git a/GraphBLAS/Source/GB_op_name_and_defn.c b/GraphBLAS/Source/op/GB_op_name_and_defn.c similarity index 99% rename from GraphBLAS/Source/GB_op_name_and_defn.c rename to GraphBLAS/Source/op/GB_op_name_and_defn.c index f3b2bb73b7..f2601928f7 100644 --- a/GraphBLAS/Source/GB_op_name_and_defn.c +++ b/GraphBLAS/Source/op/GB_op_name_and_defn.c @@ -13,7 +13,7 @@ #include "GB.h" #include -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" GrB_Info GB_op_name_and_defn ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_BitmapC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_BitmapC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_BitmapC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_BitmapC.c index ac406da039..5357fbdbe5 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_BitmapC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_BitmapC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_BitmapC // pack a bitmap matrix, held by column ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_BitmapR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_BitmapR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_BitmapR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_BitmapR.c index 377402dd8c..774bdd1c71 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_BitmapR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_BitmapR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_BitmapR // pack a bitmap matrix, held by row ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_CSC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_CSC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_CSC.c index 797e7744e0..6f085a7672 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_CSC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_CSC // pack a CSC matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_CSR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_CSR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_CSR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_CSR.c index 3af82290a7..2af50360ca 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_CSR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_CSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_CSR // pack a CSR matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_FullC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_FullC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_FullC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_FullC.c index bfcfb8355c..f23aadaeeb 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_FullC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_FullC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_FullC // pack a full matrix, held by column ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_FullR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_FullR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_FullR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_FullR.c index befb2c0694..9b7a60959f 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_FullR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_FullR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_FullR // pack a full matrix, held by row ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_HyperCSC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_HyperCSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_HyperCSC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_HyperCSC.c index 28df622298..f71bbf81f7 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_HyperCSC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_HyperCSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_HyperCSC // pack a hypersparse CSC matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_pack_HyperCSR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_HyperCSR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_pack_HyperCSR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_HyperCSR.c index 27a2c6a393..93fc7a0b8e 100644 --- a/GraphBLAS/Source/GxB_Matrix_pack_HyperCSR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_pack_HyperCSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Matrix_pack_HyperCSR // pack a hypersparse CSR matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_BitmapC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_BitmapC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_unpack_BitmapC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_BitmapC.c index 48d365c134..7c51a71860 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_BitmapC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_BitmapC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_BitmapR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_BitmapR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_unpack_BitmapR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_BitmapR.c index 312c7845c8..32660b5d5c 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_BitmapR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_BitmapR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_CSC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_unpack_CSC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_CSC.c index bbf94f5fe1..c5e35f017a 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_CSC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_CSR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_CSR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_unpack_CSR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_CSR.c index 4f87877ebc..abbce3687d 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_CSR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_CSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_FullC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_FullC.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_unpack_FullC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_FullC.c index ad6535955d..ab75ffdebd 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_FullC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_FullC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_FullR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_FullR.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_unpack_FullR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_FullR.c index caa0b92751..dfe2d19940 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_FullR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_FullR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_HyperCSC.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_HyperCSC.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_unpack_HyperCSC.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_HyperCSC.c index 6d9b250637..1051b7f7a1 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_HyperCSC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_HyperCSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Matrix_unpack_HyperCSR.c b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_HyperCSR.c similarity index 99% rename from GraphBLAS/Source/GxB_Matrix_unpack_HyperCSR.c rename to GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_HyperCSR.c index c3db546081..c22e83e76a 100644 --- a/GraphBLAS/Source/GxB_Matrix_unpack_HyperCSR.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Matrix_unpack_HyperCSR.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Vector_pack_Bitmap.c b/GraphBLAS/Source/pack_unpack/GxB_Vector_pack_Bitmap.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_pack_Bitmap.c rename to GraphBLAS/Source/pack_unpack/GxB_Vector_pack_Bitmap.c index 9fdf1a27a2..92d710c71e 100644 --- a/GraphBLAS/Source/GxB_Vector_pack_Bitmap.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Vector_pack_Bitmap.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Vector_pack_Bitmap // pack a bitmap vector ( diff --git a/GraphBLAS/Source/GxB_Vector_pack_CSC.c b/GraphBLAS/Source/pack_unpack/GxB_Vector_pack_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_pack_CSC.c rename to GraphBLAS/Source/pack_unpack/GxB_Vector_pack_CSC.c index 5d13f68dae..0f2e7b91d4 100644 --- a/GraphBLAS/Source/GxB_Vector_pack_CSC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Vector_pack_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Vector_pack_CSC // pack a vector in CSC format ( diff --git a/GraphBLAS/Source/GxB_Vector_pack_Full.c b/GraphBLAS/Source/pack_unpack/GxB_Vector_pack_Full.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_pack_Full.c rename to GraphBLAS/Source/pack_unpack/GxB_Vector_pack_Full.c index d36d969bd3..c357d0d974 100644 --- a/GraphBLAS/Source/GxB_Vector_pack_Full.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Vector_pack_Full.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" GrB_Info GxB_Vector_pack_Full // pack a full vector ( diff --git a/GraphBLAS/Source/GxB_Vector_unpack_Bitmap.c b/GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_Bitmap.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_unpack_Bitmap.c rename to GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_Bitmap.c index 43020b4fe4..d38bb1048a 100644 --- a/GraphBLAS/Source/GxB_Vector_unpack_Bitmap.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_Bitmap.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Vector_unpack_CSC.c b/GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_CSC.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_unpack_CSC.c rename to GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_CSC.c index a796c33b87..ccf061f89c 100644 --- a/GraphBLAS/Source/GxB_Vector_unpack_CSC.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_CSC.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_Vector_unpack_Full.c b/GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_Full.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_unpack_Full.c rename to GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_Full.c index 39e662955c..64b3997c6f 100644 --- a/GraphBLAS/Source/GxB_Vector_unpack_Full.c +++ b/GraphBLAS/Source/pack_unpack/GxB_Vector_unpack_Full.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GxB_pack_HyperHash.c b/GraphBLAS/Source/pack_unpack/GxB_pack_HyperHash.c similarity index 99% rename from GraphBLAS/Source/GxB_pack_HyperHash.c rename to GraphBLAS/Source/pack_unpack/GxB_pack_HyperHash.c index 4689b8f913..866f7df5a6 100644 --- a/GraphBLAS/Source/GxB_pack_HyperHash.c +++ b/GraphBLAS/Source/pack_unpack/GxB_pack_HyperHash.c @@ -55,7 +55,7 @@ // modified after they were exported/unpacked by // GxB_Matrix_(export/unpack)_Hyper(CSR/CSC). -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; GrB_Info GxB_pack_HyperHash // move Y into A->Y diff --git a/GraphBLAS/Source/GxB_unpack_HyperHash.c b/GraphBLAS/Source/pack_unpack/GxB_unpack_HyperHash.c similarity index 98% rename from GraphBLAS/Source/GxB_unpack_HyperHash.c rename to GraphBLAS/Source/pack_unpack/GxB_unpack_HyperHash.c index 301d5e83f6..ee01c6f657 100644 --- a/GraphBLAS/Source/GxB_unpack_HyperHash.c +++ b/GraphBLAS/Source/pack_unpack/GxB_unpack_HyperHash.c @@ -48,7 +48,7 @@ // matrix A, and then GrB_Matrix_wait (A, GrB_MATERIALIZE) is called, a new // hyper_hash matrix is constructed for A. -#include "GB_export.h" +#include "import_export/GB_export.h" #define GB_FREE_ALL ; GrB_Info GxB_unpack_HyperHash // move A->Y into Y diff --git a/GraphBLAS/Source/GB_Pending.h b/GraphBLAS/Source/pending/GB_Pending.h similarity index 100% rename from GraphBLAS/Source/GB_Pending.h rename to GraphBLAS/Source/pending/GB_Pending.h diff --git a/GraphBLAS/Source/GB_Pending_alloc.c b/GraphBLAS/Source/pending/GB_Pending_alloc.c similarity index 98% rename from GraphBLAS/Source/GB_Pending_alloc.c rename to GraphBLAS/Source/pending/GB_Pending_alloc.c index 45aa4b7f22..2c0f374ecd 100644 --- a/GraphBLAS/Source/GB_Pending_alloc.c +++ b/GraphBLAS/Source/pending/GB_Pending_alloc.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_Pending.h" +#include "pending/GB_Pending.h" bool GB_Pending_alloc // create a list of pending tuples ( diff --git a/GraphBLAS/Source/GB_Pending_free.c b/GraphBLAS/Source/pending/GB_Pending_free.c similarity index 97% rename from GraphBLAS/Source/GB_Pending_free.c rename to GraphBLAS/Source/pending/GB_Pending_free.c index f6b94bbc62..0395b5e506 100644 --- a/GraphBLAS/Source/GB_Pending_free.c +++ b/GraphBLAS/Source/pending/GB_Pending_free.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_Pending.h" +#include "pending/GB_Pending.h" void GB_Pending_free // free a list of pending tuples ( diff --git a/GraphBLAS/Source/GB_Pending_n.c b/GraphBLAS/Source/pending/GB_Pending_n.c similarity index 95% rename from GraphBLAS/Source/GB_Pending_n.c rename to GraphBLAS/Source/pending/GB_Pending_n.c index e65a0afb42..7a886da129 100644 --- a/GraphBLAS/Source/GB_Pending_n.c +++ b/GraphBLAS/Source/pending/GB_Pending_n.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_Pending.h" +#include "pending/GB_Pending.h" int64_t GB_Pending_n // return # of pending tuples in A ( diff --git a/GraphBLAS/Source/GB_Pending_n.h b/GraphBLAS/Source/pending/GB_Pending_n.h similarity index 100% rename from GraphBLAS/Source/GB_Pending_n.h rename to GraphBLAS/Source/pending/GB_Pending_n.h diff --git a/GraphBLAS/Source/GB_Pending_realloc.c b/GraphBLAS/Source/pending/GB_Pending_realloc.c similarity index 98% rename from GraphBLAS/Source/GB_Pending_realloc.c rename to GraphBLAS/Source/pending/GB_Pending_realloc.c index 45ca6d3d89..a7ed13a38a 100644 --- a/GraphBLAS/Source/GB_Pending_realloc.c +++ b/GraphBLAS/Source/pending/GB_Pending_realloc.c @@ -9,7 +9,7 @@ // Reallocate a list of pending tuples. If it fails, the list is freed. -#include "GB_Pending.h" +#include "pending/GB_Pending.h" bool GB_Pending_realloc // reallocate a list of pending tuples ( diff --git a/GraphBLAS/Source/GB_positional.h b/GraphBLAS/Source/positional/GB_positional.h similarity index 100% rename from GraphBLAS/Source/GB_positional.h rename to GraphBLAS/Source/positional/GB_positional.h diff --git a/GraphBLAS/Source/GB_positional_binop_ijflip.c b/GraphBLAS/Source/positional/GB_positional_binop_ijflip.c similarity index 100% rename from GraphBLAS/Source/GB_positional_binop_ijflip.c rename to GraphBLAS/Source/positional/GB_positional_binop_ijflip.c diff --git a/GraphBLAS/Source/GB_positional_idxunop_ijflip.c b/GraphBLAS/Source/positional/GB_positional_idxunop_ijflip.c similarity index 100% rename from GraphBLAS/Source/GB_positional_idxunop_ijflip.c rename to GraphBLAS/Source/positional/GB_positional_idxunop_ijflip.c diff --git a/GraphBLAS/Source/GB_positional_offset.c b/GraphBLAS/Source/positional/GB_positional_offset.c similarity index 100% rename from GraphBLAS/Source/GB_positional_offset.c rename to GraphBLAS/Source/positional/GB_positional_offset.c diff --git a/GraphBLAS/Source/GB_positional_unop_ijflip.c b/GraphBLAS/Source/positional/GB_positional_unop_ijflip.c similarity index 100% rename from GraphBLAS/Source/GB_positional_unop_ijflip.c rename to GraphBLAS/Source/positional/GB_positional_unop_ijflip.c diff --git a/GraphBLAS/Source/GB_BinaryOp_check.c b/GraphBLAS/Source/print/GB_BinaryOp_check.c similarity index 100% rename from GraphBLAS/Source/GB_BinaryOp_check.c rename to GraphBLAS/Source/print/GB_BinaryOp_check.c diff --git a/GraphBLAS/Source/GB_Context_check.c b/GraphBLAS/Source/print/GB_Context_check.c similarity index 100% rename from GraphBLAS/Source/GB_Context_check.c rename to GraphBLAS/Source/print/GB_Context_check.c diff --git a/GraphBLAS/Source/GB_Descriptor_check.c b/GraphBLAS/Source/print/GB_Descriptor_check.c similarity index 100% rename from GraphBLAS/Source/GB_Descriptor_check.c rename to GraphBLAS/Source/print/GB_Descriptor_check.c diff --git a/GraphBLAS/Source/GB_IndexUnaryOp_check.c b/GraphBLAS/Source/print/GB_IndexUnaryOp_check.c similarity index 100% rename from GraphBLAS/Source/GB_IndexUnaryOp_check.c rename to GraphBLAS/Source/print/GB_IndexUnaryOp_check.c diff --git a/GraphBLAS/Source/GB_Matrix_check.c b/GraphBLAS/Source/print/GB_Matrix_check.c similarity index 100% rename from GraphBLAS/Source/GB_Matrix_check.c rename to GraphBLAS/Source/print/GB_Matrix_check.c diff --git a/GraphBLAS/Source/GB_Monoid_check.c b/GraphBLAS/Source/print/GB_Monoid_check.c similarity index 100% rename from GraphBLAS/Source/GB_Monoid_check.c rename to GraphBLAS/Source/print/GB_Monoid_check.c diff --git a/GraphBLAS/Source/GB_Operator_check.c b/GraphBLAS/Source/print/GB_Operator_check.c similarity index 100% rename from GraphBLAS/Source/GB_Operator_check.c rename to GraphBLAS/Source/print/GB_Operator_check.c diff --git a/GraphBLAS/Source/GB_Scalar_check.c b/GraphBLAS/Source/print/GB_Scalar_check.c similarity index 100% rename from GraphBLAS/Source/GB_Scalar_check.c rename to GraphBLAS/Source/print/GB_Scalar_check.c diff --git a/GraphBLAS/Source/GB_SelectOp_check.c b/GraphBLAS/Source/print/GB_SelectOp_check.c similarity index 100% rename from GraphBLAS/Source/GB_SelectOp_check.c rename to GraphBLAS/Source/print/GB_SelectOp_check.c diff --git a/GraphBLAS/Source/GB_Semiring_check.c b/GraphBLAS/Source/print/GB_Semiring_check.c similarity index 100% rename from GraphBLAS/Source/GB_Semiring_check.c rename to GraphBLAS/Source/print/GB_Semiring_check.c diff --git a/GraphBLAS/Source/GB_Type_check.c b/GraphBLAS/Source/print/GB_Type_check.c similarity index 100% rename from GraphBLAS/Source/GB_Type_check.c rename to GraphBLAS/Source/print/GB_Type_check.c diff --git a/GraphBLAS/Source/GB_UnaryOp_check.c b/GraphBLAS/Source/print/GB_UnaryOp_check.c similarity index 100% rename from GraphBLAS/Source/GB_UnaryOp_check.c rename to GraphBLAS/Source/print/GB_UnaryOp_check.c diff --git a/GraphBLAS/Source/GB_Vector_check.c b/GraphBLAS/Source/print/GB_Vector_check.c similarity index 100% rename from GraphBLAS/Source/GB_Vector_check.c rename to GraphBLAS/Source/print/GB_Vector_check.c diff --git a/GraphBLAS/Source/GB_check.h b/GraphBLAS/Source/print/GB_check.h similarity index 100% rename from GraphBLAS/Source/GB_check.h rename to GraphBLAS/Source/print/GB_check.h diff --git a/GraphBLAS/Source/GB_code_check.c b/GraphBLAS/Source/print/GB_code_check.c similarity index 100% rename from GraphBLAS/Source/GB_code_check.c rename to GraphBLAS/Source/print/GB_code_check.c diff --git a/GraphBLAS/Source/GB_entry_check.c b/GraphBLAS/Source/print/GB_entry_check.c similarity index 100% rename from GraphBLAS/Source/GB_entry_check.c rename to GraphBLAS/Source/print/GB_entry_check.c diff --git a/GraphBLAS/Source/GB_matvec_check.c b/GraphBLAS/Source/print/GB_matvec_check.c similarity index 99% rename from GraphBLAS/Source/GB_matvec_check.c rename to GraphBLAS/Source/print/GB_matvec_check.c index 3afc9812f0..0765433eee 100644 --- a/GraphBLAS/Source/GB_matvec_check.c +++ b/GraphBLAS/Source/print/GB_matvec_check.c @@ -16,7 +16,7 @@ #define GB_DEVELOPER 0 #endif -#include "GB_Pending.h" +#include "pending/GB_Pending.h" #include "GB.h" GrB_Info GB_matvec_check // check a GraphBLAS matrix or vector diff --git a/GraphBLAS/Source/GB_printf.h b/GraphBLAS/Source/print/GB_printf.h similarity index 100% rename from GraphBLAS/Source/GB_printf.h rename to GraphBLAS/Source/print/GB_printf.h diff --git a/GraphBLAS/Source/GxB_BinaryOp_fprint.c b/GraphBLAS/Source/print/GxB_BinaryOp_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_BinaryOp_fprint.c rename to GraphBLAS/Source/print/GxB_BinaryOp_fprint.c diff --git a/GraphBLAS/Source/GxB_Context_fprint.c b/GraphBLAS/Source/print/GxB_Context_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_fprint.c rename to GraphBLAS/Source/print/GxB_Context_fprint.c diff --git a/GraphBLAS/Source/GxB_Descriptor_fprint.c b/GraphBLAS/Source/print/GxB_Descriptor_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Descriptor_fprint.c rename to GraphBLAS/Source/print/GxB_Descriptor_fprint.c diff --git a/GraphBLAS/Source/GxB_IndexUnaryOp_fprint.c b/GraphBLAS/Source/print/GxB_IndexUnaryOp_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_IndexUnaryOp_fprint.c rename to GraphBLAS/Source/print/GxB_IndexUnaryOp_fprint.c diff --git a/GraphBLAS/Source/GxB_Matrix_fprint.c b/GraphBLAS/Source/print/GxB_Matrix_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Matrix_fprint.c rename to GraphBLAS/Source/print/GxB_Matrix_fprint.c diff --git a/GraphBLAS/Source/GxB_Monoid_fprint.c b/GraphBLAS/Source/print/GxB_Monoid_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Monoid_fprint.c rename to GraphBLAS/Source/print/GxB_Monoid_fprint.c diff --git a/GraphBLAS/Source/GxB_Scalar_fprint.c b/GraphBLAS/Source/print/GxB_Scalar_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Scalar_fprint.c rename to GraphBLAS/Source/print/GxB_Scalar_fprint.c diff --git a/GraphBLAS/Source/GxB_SelectOp_fprint.c b/GraphBLAS/Source/print/GxB_SelectOp_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_SelectOp_fprint.c rename to GraphBLAS/Source/print/GxB_SelectOp_fprint.c diff --git a/GraphBLAS/Source/GxB_Semiring_fprint.c b/GraphBLAS/Source/print/GxB_Semiring_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Semiring_fprint.c rename to GraphBLAS/Source/print/GxB_Semiring_fprint.c diff --git a/GraphBLAS/Source/GxB_Type_fprint.c b/GraphBLAS/Source/print/GxB_Type_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Type_fprint.c rename to GraphBLAS/Source/print/GxB_Type_fprint.c diff --git a/GraphBLAS/Source/GxB_UnaryOp_fprint.c b/GraphBLAS/Source/print/GxB_UnaryOp_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_UnaryOp_fprint.c rename to GraphBLAS/Source/print/GxB_UnaryOp_fprint.c diff --git a/GraphBLAS/Source/GxB_Vector_fprint.c b/GraphBLAS/Source/print/GxB_Vector_fprint.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_fprint.c rename to GraphBLAS/Source/print/GxB_Vector_fprint.c diff --git a/GraphBLAS/Source/Template/GB_printf_kernels.h b/GraphBLAS/Source/print/include/GB_printf_kernels.h similarity index 100% rename from GraphBLAS/Source/Template/GB_printf_kernels.h rename to GraphBLAS/Source/print/include/GB_printf_kernels.h diff --git a/GraphBLAS/Source/GB_Scalar_reduce.c b/GraphBLAS/Source/reduce/GB_Scalar_reduce.c similarity index 98% rename from GraphBLAS/Source/GB_Scalar_reduce.c rename to GraphBLAS/Source/reduce/GB_Scalar_reduce.c index b2fc87d871..6123e6ecfd 100644 --- a/GraphBLAS/Source/GB_Scalar_reduce.c +++ b/GraphBLAS/Source/reduce/GB_Scalar_reduce.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_reduce.h" +#include "reduce/GB_reduce.h" #define GB_FREE_ALL GB_phybix_free ((GrB_Matrix) S) ; diff --git a/GraphBLAS/Source/GB_reduce.h b/GraphBLAS/Source/reduce/GB_reduce.h similarity index 100% rename from GraphBLAS/Source/GB_reduce.h rename to GraphBLAS/Source/reduce/GB_reduce.h diff --git a/GraphBLAS/Source/GB_reduce_to_scalar.c b/GraphBLAS/Source/reduce/GB_reduce_to_scalar.c similarity index 96% rename from GraphBLAS/Source/GB_reduce_to_scalar.c rename to GraphBLAS/Source/reduce/GB_reduce_to_scalar.c index d743f6b9a8..2d7b0b43ba 100644 --- a/GraphBLAS/Source/GB_reduce_to_scalar.c +++ b/GraphBLAS/Source/reduce/GB_reduce_to_scalar.c @@ -24,13 +24,13 @@ // case when nvals(A) is zero, the existence of the identity value makes the // code a little simpler. -#include "GB_reduce.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "reduce/GB_reduce.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_red__include.h" +#include "FactoryKernels/GB_red__include.h" #endif -#include "GB_monoid_shared_definitions.h" +#include "monoid/include/GB_monoid_shared_definitions.h" #define GB_FREE_ALL \ { \ @@ -240,7 +240,7 @@ GrB_Info GB_reduce_to_scalar // z = reduce_to_scalar (A) GB_Type_code typecode = A->type->code ; ASSERT (typecode <= GB_UDT_code) ; - #include "GB_red_factory.c" + #include "reduce/factory/GB_red_factory.c" } #endif } @@ -266,7 +266,7 @@ GrB_Info GB_reduce_to_scalar // z = reduce_to_scalar (A) // generic worker //------------------------------------------------------------------ - #include "GB_generic.h" + #include "generic/GB_generic.h" GxB_binary_function freduce = monoid->op->binop_function ; @@ -323,7 +323,7 @@ GrB_Info GB_reduce_to_scalar // z = reduce_to_scalar (A) #define GB_TERMINAL_CONDITION(z,zterminal) 0 #undef GB_IF_TERMINAL_BREAK #define GB_IF_TERMINAL_BREAK(z,zterminal) - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { @@ -336,7 +336,7 @@ GrB_Info GB_reduce_to_scalar // z = reduce_to_scalar (A) #undef GB_IF_TERMINAL_BREAK #define GB_IF_TERMINAL_BREAK(z,zterminal) \ if (GB_TERMINAL_CONDITION (z, zterminal)) break - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } } @@ -369,7 +369,7 @@ GrB_Info GB_reduce_to_scalar // z = reduce_to_scalar (A) #define GB_TERMINAL_CONDITION(z,zterminal) 0 #undef GB_IF_TERMINAL_BREAK #define GB_IF_TERMINAL_BREAK - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } else { @@ -382,7 +382,7 @@ GrB_Info GB_reduce_to_scalar // z = reduce_to_scalar (A) #undef GB_IF_TERMINAL_BREAK #define GB_IF_TERMINAL_BREAK(z,zterminal) \ if (GB_TERMINAL_CONDITION (z, zterminal)) break - #include "GB_reduce_to_scalar_template.c" + #include "reduce/template/GB_reduce_to_scalar_template.c" } } info = GrB_SUCCESS ; diff --git a/GraphBLAS/Source/GB_reduce_to_scalar_iso.c b/GraphBLAS/Source/reduce/GB_reduce_to_scalar_iso.c similarity index 98% rename from GraphBLAS/Source/GB_reduce_to_scalar_iso.c rename to GraphBLAS/Source/reduce/GB_reduce_to_scalar_iso.c index ee4db8a823..5d22d06d52 100644 --- a/GraphBLAS/Source/GB_reduce_to_scalar_iso.c +++ b/GraphBLAS/Source/reduce/GB_reduce_to_scalar_iso.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_reduce.h" +#include "reduce/GB_reduce.h" void GB_reduce_to_scalar_iso // s = reduce (A) where A is iso ( diff --git a/GraphBLAS/Source/GB_reduce_to_vector.c b/GraphBLAS/Source/reduce/GB_reduce_to_vector.c similarity index 98% rename from GraphBLAS/Source/GB_reduce_to_vector.c rename to GraphBLAS/Source/reduce/GB_reduce_to_vector.c index a6d5b5d174..2ed85cb1df 100644 --- a/GraphBLAS/Source/GB_reduce_to_vector.c +++ b/GraphBLAS/Source/reduce/GB_reduce_to_vector.c @@ -16,11 +16,11 @@ GrB_Semiring_free (&semiring) ; \ } -#include "GB_reduce.h" -#include "GB_binop.h" -#include "GB_mxm.h" -#include "GB_get_mask.h" -#include "GB_Semiring_new.h" +#include "reduce/GB_reduce.h" +#include "binaryop/GB_binop.h" +#include "mxm/GB_mxm.h" +#include "mask/GB_get_mask.h" +#include "semiring/GB_Semiring_new.h" GrB_Info GB_reduce_to_vector // C = accum (C,reduce(A)) ( diff --git a/GraphBLAS/Source/GB_reduce_worker_iso.c b/GraphBLAS/Source/reduce/GB_reduce_worker_iso.c similarity index 98% rename from GraphBLAS/Source/GB_reduce_worker_iso.c rename to GraphBLAS/Source/reduce/GB_reduce_worker_iso.c index 477b7dded4..818118e99f 100644 --- a/GraphBLAS/Source/GB_reduce_worker_iso.c +++ b/GraphBLAS/Source/reduce/GB_reduce_worker_iso.c @@ -11,7 +11,7 @@ // O(log (n)) time which is fast enough, even if n = 2^60, and it works for all // monoids including user-defined ones. -#include "GB_reduce.h" +#include "reduce/GB_reduce.h" void GB_reduce_worker_iso ( diff --git a/GraphBLAS/Source/GrB_Matrix_reduce.c b/GraphBLAS/Source/reduce/GrB_Matrix_reduce.c similarity index 99% rename from GraphBLAS/Source/GrB_Matrix_reduce.c rename to GraphBLAS/Source/reduce/GrB_Matrix_reduce.c index e849171cf9..a2933e4477 100644 --- a/GraphBLAS/Source/GrB_Matrix_reduce.c +++ b/GraphBLAS/Source/reduce/GrB_Matrix_reduce.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_reduce.h" -#include "GB_binop.h" +#include "reduce/GB_reduce.h" +#include "binaryop/GB_binop.h" //------------------------------------------------------------------------------ // GrB_Matrix_reduce_TYPE: reduce a matrix to a scalar diff --git a/GraphBLAS/Source/GrB_Vector_reduce.c b/GraphBLAS/Source/reduce/GrB_Vector_reduce.c similarity index 99% rename from GraphBLAS/Source/GrB_Vector_reduce.c rename to GraphBLAS/Source/reduce/GrB_Vector_reduce.c index b49ebbe27e..86a6aafd39 100644 --- a/GraphBLAS/Source/GrB_Vector_reduce.c +++ b/GraphBLAS/Source/reduce/GrB_Vector_reduce.c @@ -7,8 +7,8 @@ //------------------------------------------------------------------------------ -#include "GB_reduce.h" -#include "GB_binop.h" +#include "reduce/GB_reduce.h" +#include "binaryop/GB_binop.h" //------------------------------------------------------------------------------ // GrB_Vector_reduce_TYPE: reduce a vector to a scalar diff --git a/GraphBLAS/Source/Factories/GB_red_factory.c b/GraphBLAS/Source/reduce/factory/GB_red_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_red_factory.c rename to GraphBLAS/Source/reduce/factory/GB_red_factory.c diff --git a/GraphBLAS/Source/Template/GB_reduce_panel.c b/GraphBLAS/Source/reduce/template/GB_reduce_panel.c similarity index 99% rename from GraphBLAS/Source/Template/GB_reduce_panel.c rename to GraphBLAS/Source/reduce/template/GB_reduce_panel.c index a047362900..27c4e7873e 100644 --- a/GraphBLAS/Source/Template/GB_reduce_panel.c +++ b/GraphBLAS/Source/reduce/template/GB_reduce_panel.c @@ -16,7 +16,7 @@ // The Panel and W arrays always have the same type as z, GB_Z_TYPE. -#include "GB_unused.h" +#include "include/GB_unused.h" // default panel size #ifndef GB_PANEL diff --git a/GraphBLAS/Source/Template/GB_reduce_to_scalar_template.c b/GraphBLAS/Source/reduce/template/GB_reduce_to_scalar_template.c similarity index 99% rename from GraphBLAS/Source/Template/GB_reduce_to_scalar_template.c rename to GraphBLAS/Source/reduce/template/GB_reduce_to_scalar_template.c index c22ef3bd42..4f61c0dc56 100644 --- a/GraphBLAS/Source/Template/GB_reduce_to_scalar_template.c +++ b/GraphBLAS/Source/reduce/template/GB_reduce_to_scalar_template.c @@ -11,7 +11,7 @@ // No panel is used. The workspace W always has the same type as the ztype // of the monoid, GB_Z_TYPE. -#include "GB_unused.h" +#include "include/GB_unused.h" // z += W [i], no typecast #ifndef GB_ADD_ARRAY_TO_SCALAR diff --git a/GraphBLAS/Source/GB_reshape.c b/GraphBLAS/Source/reshape/GB_reshape.c similarity index 99% rename from GraphBLAS/Source/GB_reshape.c rename to GraphBLAS/Source/reshape/GB_reshape.c index 3f9f9b6189..80640ed3b3 100644 --- a/GraphBLAS/Source/GB_reshape.c +++ b/GraphBLAS/Source/reshape/GB_reshape.c @@ -14,10 +14,10 @@ // nrows_new*ncols_new. #include "GB.h" -#include "GB_reshape.h" -#include "GB_transpose.h" -#include "GB_ek_slice.h" -#include "GB_build.h" +#include "reshape/GB_reshape.h" +#include "transpose/GB_transpose.h" +#include "slice/GB_ek_slice.h" +#include "builder/GB_build.h" #define GB_FREE_WORKSPACE \ { \ diff --git a/GraphBLAS/Source/GB_reshape.h b/GraphBLAS/Source/reshape/GB_reshape.h similarity index 100% rename from GraphBLAS/Source/GB_reshape.h rename to GraphBLAS/Source/reshape/GB_reshape.h diff --git a/GraphBLAS/Source/GxB_Matrix_reshape.c b/GraphBLAS/Source/reshape/GxB_Matrix_reshape.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_reshape.c rename to GraphBLAS/Source/reshape/GxB_Matrix_reshape.c index 83fda033b7..aec259ede2 100644 --- a/GraphBLAS/Source/GxB_Matrix_reshape.c +++ b/GraphBLAS/Source/reshape/GxB_Matrix_reshape.c @@ -31,7 +31,7 @@ // format need not match the by_col input parameter. #include "GB.h" -#include "GB_reshape.h" +#include "reshape/GB_reshape.h" GrB_Info GxB_Matrix_reshape // reshape a GrB_Matrix in place ( diff --git a/GraphBLAS/Source/GxB_Matrix_reshapeDup.c b/GraphBLAS/Source/reshape/GxB_Matrix_reshapeDup.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_reshapeDup.c rename to GraphBLAS/Source/reshape/GxB_Matrix_reshapeDup.c index 43b3f096c9..09045a99bd 100644 --- a/GraphBLAS/Source/GxB_Matrix_reshapeDup.c +++ b/GraphBLAS/Source/reshape/GxB_Matrix_reshapeDup.c @@ -16,7 +16,7 @@ // by_col input parameter. #include "GB.h" -#include "GB_reshape.h" +#include "reshape/GB_reshape.h" GrB_Info GxB_Matrix_reshapeDup // reshape a GrB_Matrix into another GrB_Matrix ( diff --git a/GraphBLAS/Source/GB_resize.c b/GraphBLAS/Source/resize/GB_resize.c similarity index 99% rename from GraphBLAS/Source/GB_resize.c rename to GraphBLAS/Source/resize/GB_resize.c index 8357b9f0e9..86ef000ecc 100644 --- a/GraphBLAS/Source/GB_resize.c +++ b/GraphBLAS/Source/resize/GB_resize.c @@ -9,8 +9,9 @@ // JIT: not needed. Only one variant possible. -#include "GB_select.h" -#include "GB_scalar_wrap.h" +#include "select/GB_select.h" +#include "scalar/GB_Scalar_wrap.h" +#include "resize/GB_resize.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_resize.h b/GraphBLAS/Source/resize/GB_resize.h similarity index 100% rename from GraphBLAS/Source/GB_resize.h rename to GraphBLAS/Source/resize/GB_resize.h diff --git a/GraphBLAS/Source/GrB_Matrix_resize.c b/GraphBLAS/Source/resize/GrB_Matrix_resize.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_resize.c rename to GraphBLAS/Source/resize/GrB_Matrix_resize.c index 35a64a5181..0663b0289e 100644 --- a/GraphBLAS/Source/GrB_Matrix_resize.c +++ b/GraphBLAS/Source/resize/GrB_Matrix_resize.c @@ -8,6 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" +#include "resize/GB_resize.h" GrB_Info GrB_Matrix_resize // change the size of a matrix ( diff --git a/GraphBLAS/Source/GrB_Vector_resize.c b/GraphBLAS/Source/resize/GrB_Vector_resize.c similarity index 98% rename from GraphBLAS/Source/GrB_Vector_resize.c rename to GraphBLAS/Source/resize/GrB_Vector_resize.c index dd39ee9340..73df8a6389 100644 --- a/GraphBLAS/Source/GrB_Vector_resize.c +++ b/GraphBLAS/Source/resize/GrB_Vector_resize.c @@ -8,6 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" +#include "resize/GB_resize.h" GrB_Info GrB_Vector_resize // change the size of a vector ( diff --git a/GraphBLAS/Source/GB_Scalar_wrap.c b/GraphBLAS/Source/scalar/GB_Scalar_wrap.c similarity index 98% rename from GraphBLAS/Source/GB_Scalar_wrap.c rename to GraphBLAS/Source/scalar/GB_Scalar_wrap.c index 6da7e5e52b..d255842678 100644 --- a/GraphBLAS/Source/GB_Scalar_wrap.c +++ b/GraphBLAS/Source/scalar/GB_Scalar_wrap.c @@ -14,7 +14,7 @@ // automatically to the GPU when using CUDA. #include "GB.h" -#include "GB_scalar_wrap.h" +#include "scalar/GB_Scalar_wrap.h" GrB_Scalar GB_Scalar_wrap // create a new GrB_Scalar with one entry ( diff --git a/GraphBLAS/Source/GB_scalar_wrap.h b/GraphBLAS/Source/scalar/GB_Scalar_wrap.h similarity index 97% rename from GraphBLAS/Source/GB_scalar_wrap.h rename to GraphBLAS/Source/scalar/GB_Scalar_wrap.h index 9964e8c8a3..8a0ed4a9c0 100644 --- a/GraphBLAS/Source/GB_scalar_wrap.h +++ b/GraphBLAS/Source/scalar/GB_Scalar_wrap.h @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_scalar_wrap.h: definitions for GB_scalar_wrap +// GB_Scalar_wrap.h: definitions for GB_Scalar_wrap //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. diff --git a/GraphBLAS/Source/GrB_Scalar_clear.c b/GraphBLAS/Source/scalar/GrB_Scalar_clear.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_clear.c rename to GraphBLAS/Source/scalar/GrB_Scalar_clear.c diff --git a/GraphBLAS/Source/GrB_Scalar_free.c b/GraphBLAS/Source/scalar/GrB_Scalar_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_free.c rename to GraphBLAS/Source/scalar/GrB_Scalar_free.c diff --git a/GraphBLAS/Source/GrB_Scalar_new.c b/GraphBLAS/Source/scalar/GrB_Scalar_new.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_new.c rename to GraphBLAS/Source/scalar/GrB_Scalar_new.c diff --git a/GraphBLAS/Source/GB_select.c b/GraphBLAS/Source/select/GB_select.c similarity index 99% rename from GraphBLAS/Source/GB_select.c rename to GraphBLAS/Source/select/GB_select.c index 3b2088fa99..278821dfc0 100644 --- a/GraphBLAS/Source/GB_select.c +++ b/GraphBLAS/Source/select/GB_select.c @@ -14,10 +14,10 @@ GB_Matrix_free (&T) ; \ } -#include "GB_select.h" -#include "GB_accum_mask.h" -#include "GB_transpose.h" -#include "GB_scalar_wrap.h" +#include "select/GB_select.h" +#include "mask/GB_accum_mask.h" +#include "transpose/GB_transpose.h" +#include "scalar/GB_Scalar_wrap.h" GrB_Info GB_select // C = accum (C, select(A,k)) or select(A',k) ( diff --git a/GraphBLAS/Source/GB_select.h b/GraphBLAS/Source/select/GB_select.h similarity index 98% rename from GraphBLAS/Source/GB_select.h rename to GraphBLAS/Source/select/GB_select.h index e049edd6af..2492682c72 100644 --- a/GraphBLAS/Source/GB_select.h +++ b/GraphBLAS/Source/select/GB_select.h @@ -10,8 +10,7 @@ #ifndef GB_SELECT_H #define GB_SELECT_H #include "GB.h" -#include "GB_math.h" -#include "GB_is_nonzero.h" +#include "math/GB_math.h" GrB_Info GB_select // C = accum (C, select(A,k)) or select(A',k) ( @@ -208,7 +207,7 @@ static inline void GB_select_iso // Some parameters are unused for some uses of the FactoryKernels/GB_sel_* // functions -#include "GB_unused.h" +#include "include/GB_unused.h" #endif diff --git a/GraphBLAS/Source/GB_select_bitmap.c b/GraphBLAS/Source/select/GB_select_bitmap.c similarity index 97% rename from GraphBLAS/Source/GB_select_bitmap.c rename to GraphBLAS/Source/select/GB_select_bitmap.c index df327d1864..4ef1440405 100644 --- a/GraphBLAS/Source/GB_select_bitmap.c +++ b/GraphBLAS/Source/select/GB_select_bitmap.c @@ -9,10 +9,10 @@ // JIT: done. -#include "GB_select.h" -#include "GB_stringify.h" +#include "select/GB_select.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_sel__include.h" +#include "FactoryKernels/GB_sel__include.h" #endif #define GB_FREE_ALL \ @@ -129,7 +129,7 @@ GrB_Info GB_select_bitmap } \ break ; - #include "GB_select_entry_factory.c" + #include "select/factory/GB_select_entry_factory.c" } #endif diff --git a/GraphBLAS/Source/GB_select_column.c b/GraphBLAS/Source/select/GB_select_column.c similarity index 99% rename from GraphBLAS/Source/GB_select_column.c rename to GraphBLAS/Source/select/GB_select_column.c index f628575d76..163a4daaeb 100644 --- a/GraphBLAS/Source/GB_select_column.c +++ b/GraphBLAS/Source/select/GB_select_column.c @@ -11,9 +11,9 @@ // The column selectors can be done in a single pass. -#include "GB_select.h" -#include "GB_transpose.h" -#include "GB_stringify.h" +#include "select/GB_select.h" +#include "transpose/GB_transpose.h" +#include "jitifyer/GB_stringify.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_select_generic_bitmap.c b/GraphBLAS/Source/select/GB_select_generic_bitmap.c similarity index 92% rename from GraphBLAS/Source/GB_select_generic_bitmap.c rename to GraphBLAS/Source/select/GB_select_generic_bitmap.c index 97489d948e..c7608c0e1d 100644 --- a/GraphBLAS/Source/GB_select_generic_bitmap.c +++ b/GraphBLAS/Source/select/GB_select_generic_bitmap.c @@ -9,8 +9,8 @@ // A is bitmap or full, C is bitmap -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" GrB_Info GB_select_generic_bitmap ( @@ -53,7 +53,7 @@ GrB_Info GB_select_generic_bitmap #define GB_GENERIC #define GB_ENTRY_SELECTOR #define GB_A_TYPE GB_void - #include "GB_select_shared_definitions.h" + #include "select/include/GB_select_shared_definitions.h" if (A->iso) { @@ -77,7 +77,7 @@ GrB_Info GB_select_generic_bitmap bool keep ; \ fkeep (&keep, x, flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" } else @@ -96,7 +96,7 @@ GrB_Info GB_select_generic_bitmap fkeep (z, x, flipij ? j : i, flipij ? i : j, ythunk) ; \ cast_Z_to_bool (&keep, z, zsize) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" } } @@ -116,7 +116,7 @@ GrB_Info GB_select_generic_bitmap fkeep (&keep, Ax +(p)*asize, \ flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" } else @@ -138,7 +138,7 @@ GrB_Info GB_select_generic_bitmap fkeep (z, x, flipij ? j : i, flipij ? i : j, ythunk) ; \ cast_Z_to_bool (&keep, z, zsize) ; - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" } diff --git a/GraphBLAS/Source/GB_select_generic_phase1.c b/GraphBLAS/Source/select/GB_select_generic_phase1.c similarity index 92% rename from GraphBLAS/Source/GB_select_generic_phase1.c rename to GraphBLAS/Source/select/GB_select_generic_phase1.c index 258055be8f..7ddbf88ee5 100644 --- a/GraphBLAS/Source/GB_select_generic_phase1.c +++ b/GraphBLAS/Source/select/GB_select_generic_phase1.c @@ -10,8 +10,8 @@ // A is sparse, hypersparse, or full, and the op is not positional. // C is sparse or hypersparse. -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" GrB_Info GB_select_generic_phase1 ( @@ -53,7 +53,7 @@ GrB_Info GB_select_generic_phase1 #define GB_GENERIC #define GB_A_TYPE GB_void - #include "GB_select_shared_definitions.h" + #include "select/include/GB_select_shared_definitions.h" if (A->iso) { @@ -76,7 +76,7 @@ GrB_Info GB_select_generic_phase1 #define GB_TEST_VALUE_OF_ENTRY(keep,p) \ bool keep ; \ fkeep (&keep, x, flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" } else @@ -94,7 +94,7 @@ GrB_Info GB_select_generic_phase1 GB_void z [GB_VLA(zsize)] ; \ fkeep (z, x, flipij ? j : i, flipij ? i : j, ythunk) ; \ cast_Z_to_bool (&keep, z, zsize) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" } @@ -114,7 +114,7 @@ GrB_Info GB_select_generic_phase1 bool keep ; \ fkeep (&keep, Ax +(p)*asize, \ flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" } else @@ -135,7 +135,7 @@ GrB_Info GB_select_generic_phase1 cast_A_to_X (x, Ax +(p)*asize, asize) ; \ fkeep (z, x, flipij ? j : i, flipij ? i : j, ythunk) ; \ cast_Z_to_bool (&keep, z, zsize) ; - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" } } diff --git a/GraphBLAS/Source/GB_select_generic_phase2.c b/GraphBLAS/Source/select/GB_select_generic_phase2.c similarity index 94% rename from GraphBLAS/Source/GB_select_generic_phase2.c rename to GraphBLAS/Source/select/GB_select_generic_phase2.c index 1e7438f07f..0c4961da6e 100644 --- a/GraphBLAS/Source/GB_select_generic_phase2.c +++ b/GraphBLAS/Source/select/GB_select_generic_phase2.c @@ -10,8 +10,8 @@ // A is sparse, hypersparse, or full, and the op is not positional. // C is sparse or hypersparse. -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" GrB_Info GB_select_generic_phase2 ( @@ -65,7 +65,7 @@ GrB_Info GB_select_generic_phase2 #define GB_GENERIC #define GB_ENTRY_SELECTOR #define GB_A_TYPE GB_void - #include "GB_select_shared_definitions.h" + #include "select/include/GB_select_shared_definitions.h" // GB_ISO_SELECT is always #defined'd as 1 here, even though C can be iso. // The case when C is iso is handled by the GB_SELECT_ENTRY macro itself. @@ -95,7 +95,7 @@ GrB_Info GB_select_generic_phase2 #define GB_TEST_VALUE_OF_ENTRY(keep,p) \ bool keep ; \ fkeep (&keep, x, flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" } else @@ -113,7 +113,7 @@ GrB_Info GB_select_generic_phase2 GB_void z [GB_VLA(zsize)] ; \ fkeep (z, x, flipij ? j : i, flipij ? i : j, ythunk) ; \ cast_Z_to_bool (&keep, z, zsize) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" } @@ -143,7 +143,7 @@ GrB_Info GB_select_generic_phase2 #undef GB_TEST_VALUE_OF_ENTRY #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" } else if (op->ztype == GrB_BOOL && op->xtype == A->type) @@ -158,7 +158,7 @@ GrB_Info GB_select_generic_phase2 bool keep ; \ fkeep (&keep, Ax +(p)*asize, \ flipij ? j : i, flipij ? i : j, ythunk) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" } else @@ -179,7 +179,7 @@ GrB_Info GB_select_generic_phase2 cast_A_to_X (x, Ax +(p)*asize, asize) ; \ fkeep (z, x, flipij ? j : i, flipij ? i : j, ythunk) ; \ cast_Z_to_bool (&keep, z, zsize) ; - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" } } diff --git a/GraphBLAS/Source/GB_select_positional_bitmap.c b/GraphBLAS/Source/select/GB_select_positional_bitmap.c similarity index 75% rename from GraphBLAS/Source/GB_select_positional_bitmap.c rename to GraphBLAS/Source/select/GB_select_positional_bitmap.c index dc14364719..066a7ba8a2 100644 --- a/GraphBLAS/Source/GB_select_positional_bitmap.c +++ b/GraphBLAS/Source/select/GB_select_positional_bitmap.c @@ -11,8 +11,8 @@ // A is bitmap or as-if-full. C is bitmap -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" GrB_Info GB_select_positional_bitmap ( @@ -38,60 +38,60 @@ GrB_Info GB_select_positional_bitmap //-------------------------------------------------------------------------- #define GB_A_TYPE GB_void - #include "GB_select_shared_definitions.h" + #include "select/include/GB_select_shared_definitions.h" switch (opcode) { case GB_TRIL_idxunop_code : #define GB_TRIL_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_TRIU_idxunop_code : #define GB_TRIU_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_DIAG_idxunop_code : #define GB_DIAG_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_OFFDIAG_idxunop_code : case GB_DIAGINDEX_idxunop_code : #define GB_OFFDIAG_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_ROWINDEX_idxunop_code : #define GB_ROWINDEX_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_ROWLE_idxunop_code : #define GB_ROWLE_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_ROWGT_idxunop_code : #define GB_ROWGT_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_COLINDEX_idxunop_code : #define GB_COLINDEX_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_COLLE_idxunop_code : #define GB_COLLE_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; case GB_COLGT_idxunop_code : #define GB_COLGT_SELECTOR - #include "GB_select_bitmap_template.c" + #include "select/template/GB_select_bitmap_template.c" break ; default: ; diff --git a/GraphBLAS/Source/GB_select_positional_phase1.c b/GraphBLAS/Source/select/GB_select_positional_phase1.c similarity index 77% rename from GraphBLAS/Source/GB_select_positional_phase1.c rename to GraphBLAS/Source/select/GB_select_positional_phase1.c index 7a18f4e4e5..97ce29a44d 100644 --- a/GraphBLAS/Source/GB_select_positional_phase1.c +++ b/GraphBLAS/Source/select/GB_select_positional_phase1.c @@ -11,8 +11,8 @@ // JIT: not needed, but 3 variants possible (A sparse, hyper, or full for DIAG) -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" GrB_Info GB_select_positional_phase1 ( @@ -44,52 +44,52 @@ GrB_Info GB_select_positional_phase1 // phase1: positional operators and nonzombie selector //-------------------------------------------------------------------------- - #include "GB_select_shared_definitions.h" + #include "select/include/GB_select_shared_definitions.h" switch (opcode) { case GB_TRIL_idxunop_code : #define GB_TRIL_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_TRIU_idxunop_code : #define GB_TRIU_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_DIAG_idxunop_code : #define GB_DIAG_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_OFFDIAG_idxunop_code : case GB_DIAGINDEX_idxunop_code : #define GB_OFFDIAG_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_ROWINDEX_idxunop_code : #define GB_ROWINDEX_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_ROWLE_idxunop_code : #define GB_ROWLE_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_ROWGT_idxunop_code : #define GB_ROWGT_SELECTOR - #include "GB_select_positional_phase1_template.c" + #include "select/template/GB_select_positional_phase1_template.c" break ; case GB_NONZOMBIE_idxunop_code : // keep A(i,j) if it's not a zombie #define GB_A_TYPE GB_void #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) - #include "GB_select_entry_phase1_template.c" + #include "select/template/GB_select_entry_phase1_template.c" break ; default: ; diff --git a/GraphBLAS/Source/GB_select_positional_phase2.c b/GraphBLAS/Source/select/GB_select_positional_phase2.c similarity index 80% rename from GraphBLAS/Source/GB_select_positional_phase2.c rename to GraphBLAS/Source/select/GB_select_positional_phase2.c index 0dd7c21266..3623620a1c 100644 --- a/GraphBLAS/Source/GB_select_positional_phase2.c +++ b/GraphBLAS/Source/select/GB_select_positional_phase2.c @@ -11,8 +11,8 @@ // JIT: not needed, but 3 variants possible (A sparse, hyper, or full for DIAG) -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" GrB_Info GB_select_positional_phase2 ( @@ -46,7 +46,7 @@ GrB_Info GB_select_positional_phase2 //-------------------------------------------------------------------------- #define GB_A_TYPE GB_void - #include "GB_select_shared_definitions.h" + #include "select/include/GB_select_shared_definitions.h" if (A->iso) { @@ -63,38 +63,38 @@ GrB_Info GB_select_positional_phase2 case GB_TRIL_idxunop_code : #define GB_TRIL_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_TRIU_idxunop_code : #define GB_TRIU_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_DIAG_idxunop_code : #define GB_DIAG_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_OFFDIAG_idxunop_code : case GB_DIAGINDEX_idxunop_code : #define GB_OFFDIAG_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_ROWINDEX_idxunop_code : #define GB_ROWINDEX_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_ROWLE_idxunop_code : #define GB_ROWLE_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_ROWGT_idxunop_code : #define GB_ROWGT_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_NONZOMBIE_idxunop_code : @@ -103,7 +103,7 @@ GrB_Info GB_select_positional_phase2 #define GB_TEST_VALUE_OF_ENTRY(keep,p) bool keep = (i >= 0) // A is iso and thus so is C, so do not select the value #define GB_SELECT_ENTRY(Cx,pC,Ax,pA) - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" #undef GB_ENTRY_SELECTOR break ; @@ -126,38 +126,38 @@ GrB_Info GB_select_positional_phase2 case GB_TRIL_idxunop_code : #define GB_TRIL_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_TRIU_idxunop_code : #define GB_TRIU_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_DIAG_idxunop_code : #define GB_DIAG_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_OFFDIAG_idxunop_code : case GB_DIAGINDEX_idxunop_code : #define GB_OFFDIAG_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_ROWINDEX_idxunop_code : #define GB_ROWINDEX_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_ROWLE_idxunop_code : #define GB_ROWLE_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; case GB_ROWGT_idxunop_code : #define GB_ROWGT_SELECTOR - #include "GB_select_phase2.c" + #include "select/template/GB_select_phase2.c" break ; default: ; diff --git a/GraphBLAS/Source/GB_select_sparse.c b/GraphBLAS/Source/select/GB_select_sparse.c similarity index 98% rename from GraphBLAS/Source/GB_select_sparse.c rename to GraphBLAS/Source/select/GB_select_sparse.c index 8374b78809..f23dbd4e39 100644 --- a/GraphBLAS/Source/GB_select_sparse.c +++ b/GraphBLAS/Source/select/GB_select_sparse.c @@ -9,13 +9,13 @@ // JIT: done. -#include "GB_select.h" -#include "GB_ek_slice.h" +#include "select/GB_select.h" +#include "slice/GB_ek_slice.h" #ifndef GBCOMPACT -#include "GB_sel__include.h" +#include "FactoryKernels/GB_sel__include.h" #endif -#include "GB_scalar_wrap.h" -#include "GB_stringify.h" +#include "scalar/GB_Scalar_wrap.h" +#include "jitifyer/GB_stringify.h" #define GB_FREE_WORKSPACE \ { \ @@ -202,7 +202,7 @@ GrB_Info GB_select_sparse break ; // launch the switch factory - #include "GB_select_entry_factory.c" + #include "select/factory/GB_select_entry_factory.c" #undef GB_SEL_WORKER } #endif @@ -316,7 +316,7 @@ GrB_Info GB_select_sparse break ; // launch the switch factory - #include "GB_select_entry_factory.c" + #include "select/factory/GB_select_entry_factory.c" } #endif diff --git a/GraphBLAS/Source/GB_select_value_iso.c b/GraphBLAS/Source/select/GB_select_value_iso.c similarity index 97% rename from GraphBLAS/Source/GB_select_value_iso.c rename to GraphBLAS/Source/select/GB_select_value_iso.c index ff4598472c..1ea4d55f5f 100644 --- a/GraphBLAS/Source/GB_select_value_iso.c +++ b/GraphBLAS/Source/select/GB_select_value_iso.c @@ -20,9 +20,9 @@ GB_phybix_free (C) ; \ } -#include "GB_select.h" -#include "GB_scalar_wrap.h" -#include "GB_transpose.h" +#include "select/GB_select.h" +#include "scalar/GB_Scalar_wrap.h" +#include "transpose/GB_transpose.h" GrB_Info GB_select_value_iso ( diff --git a/GraphBLAS/Source/GB_selectop_to_idxunop.c b/GraphBLAS/Source/select/GB_selectop_to_idxunop.c similarity index 99% rename from GraphBLAS/Source/GB_selectop_to_idxunop.c rename to GraphBLAS/Source/select/GB_selectop_to_idxunop.c index 0347987e2c..44e58d4856 100644 --- a/GraphBLAS/Source/GB_selectop_to_idxunop.c +++ b/GraphBLAS/Source/select/GB_selectop_to_idxunop.c @@ -19,7 +19,7 @@ GB_Matrix_free ((GrB_Matrix *) &NewThunk) ; \ } -#include "GB_select.h" +#include "select/GB_select.h" GrB_Info GB_selectop_to_idxunop ( diff --git a/GraphBLAS/Source/GB_selector.c b/GraphBLAS/Source/select/GB_selector.c similarity index 99% rename from GraphBLAS/Source/GB_selector.c rename to GraphBLAS/Source/select/GB_selector.c index d27a1fc04c..0f6576709d 100644 --- a/GraphBLAS/Source/GB_selector.c +++ b/GraphBLAS/Source/select/GB_selector.c @@ -19,7 +19,7 @@ // TODO: GB_selector does not exploit the mask. -#include "GB_select.h" +#include "select/GB_select.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GrB_Matrix_select.c b/GraphBLAS/Source/select/GrB_Matrix_select.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_select.c rename to GraphBLAS/Source/select/GrB_Matrix_select.c index 98d170d089..b7fad2f15f 100644 --- a/GraphBLAS/Source/GrB_Matrix_select.c +++ b/GraphBLAS/Source/select/GrB_Matrix_select.c @@ -9,9 +9,9 @@ // C = accum(C,select(A,k)) or accum(C,select(A',)) -#include "GB_select.h" -#include "GB_get_mask.h" -#include "GB_scalar_wrap.h" +#include "select/GB_select.h" +#include "mask/GB_get_mask.h" +#include "scalar/GB_Scalar_wrap.h" //------------------------------------------------------------------------------ // GB_sel: select using a GrB_IndexUnaryOp diff --git a/GraphBLAS/Source/GrB_Vector_select.c b/GraphBLAS/Source/select/GrB_Vector_select.c similarity index 98% rename from GraphBLAS/Source/GrB_Vector_select.c rename to GraphBLAS/Source/select/GrB_Vector_select.c index 49ae96a9c6..eddc40b3a6 100644 --- a/GraphBLAS/Source/GrB_Vector_select.c +++ b/GraphBLAS/Source/select/GrB_Vector_select.c @@ -7,9 +7,9 @@ //------------------------------------------------------------------------------ -#include "GB_select.h" -#include "GB_get_mask.h" -#include "GB_scalar_wrap.h" +#include "select/GB_select.h" +#include "mask/GB_get_mask.h" +#include "scalar/GB_Scalar_wrap.h" //------------------------------------------------------------------------------ // GB_sel: select using a GrB_IndexUnaryOp diff --git a/GraphBLAS/Source/GxB_Matrix_select.c b/GraphBLAS/Source/select/GxB_Matrix_select.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_select.c rename to GraphBLAS/Source/select/GxB_Matrix_select.c index 7bb90ce89f..6e2de2c106 100644 --- a/GraphBLAS/Source/GxB_Matrix_select.c +++ b/GraphBLAS/Source/select/GxB_Matrix_select.c @@ -14,8 +14,8 @@ GrB_Scalar_free (&Thunk) ; \ } -#include "GB_select.h" -#include "GB_get_mask.h" +#include "select/GB_select.h" +#include "mask/GB_get_mask.h" GrB_Info GxB_Matrix_select // C = accum (C, select(A,k)) or select(A',k) ( diff --git a/GraphBLAS/Source/GxB_Vector_select.c b/GraphBLAS/Source/select/GxB_Vector_select.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_select.c rename to GraphBLAS/Source/select/GxB_Vector_select.c index 616832eb86..01c852d3ac 100644 --- a/GraphBLAS/Source/GxB_Vector_select.c +++ b/GraphBLAS/Source/select/GxB_Vector_select.c @@ -14,8 +14,8 @@ GrB_Scalar_free (&Thunk) ; \ } -#include "GB_select.h" -#include "GB_get_mask.h" +#include "select/GB_select.h" +#include "mask/GB_get_mask.h" GrB_Info GxB_Vector_select // w = accum (w, select(u,k)) ( diff --git a/GraphBLAS/Source/Factories/GB_select_entry_factory.c b/GraphBLAS/Source/select/factory/GB_select_entry_factory.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_select_entry_factory.c rename to GraphBLAS/Source/select/factory/GB_select_entry_factory.c diff --git a/GraphBLAS/Source/Shared/GB_select_shared_definitions.h b/GraphBLAS/Source/select/include/GB_select_shared_definitions.h similarity index 94% rename from GraphBLAS/Source/Shared/GB_select_shared_definitions.h rename to GraphBLAS/Source/select/include/GB_select_shared_definitions.h index 97b91853ce..22a67d872f 100644 --- a/GraphBLAS/Source/Shared/GB_select_shared_definitions.h +++ b/GraphBLAS/Source/select/include/GB_select_shared_definitions.h @@ -12,7 +12,7 @@ // this file. This file is shared by generic, factory, and both CPU and // CUDA JIT kernels. -#include "GB_kernel_shared_definitions.h" +#include "include/GB_kernel_shared_definitions.h" #ifndef GB_SELECT_SHARED_DEFINITIONS_H #define GB_SELECT_SHARED_DEFINITIONS_H diff --git a/GraphBLAS/Source/Template/GB_select_bitmap_bitmap_template.c b/GraphBLAS/Source/select/template/GB_select_bitmap_bitmap_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_select_bitmap_bitmap_template.c rename to GraphBLAS/Source/select/template/GB_select_bitmap_bitmap_template.c diff --git a/GraphBLAS/Source/Template/GB_select_bitmap_full_template.c b/GraphBLAS/Source/select/template/GB_select_bitmap_full_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_select_bitmap_full_template.c rename to GraphBLAS/Source/select/template/GB_select_bitmap_full_template.c diff --git a/GraphBLAS/Source/Template/GB_select_bitmap_template.c b/GraphBLAS/Source/select/template/GB_select_bitmap_template.c similarity index 81% rename from GraphBLAS/Source/Template/GB_select_bitmap_template.c rename to GraphBLAS/Source/select/template/GB_select_bitmap_template.c index f210481168..247f573eab 100644 --- a/GraphBLAS/Source/Template/GB_select_bitmap_template.c +++ b/GraphBLAS/Source/select/template/GB_select_bitmap_template.c @@ -16,12 +16,12 @@ { // A is bitmap int8_t *Ab = A->b ; - #include "GB_select_bitmap_bitmap_template.c" + #include "template/GB_select_bitmap_bitmap_template.c" } #else { // A is full - #include "GB_select_bitmap_full_template.c" + #include "template/GB_select_bitmap_full_template.c" } #endif } @@ -31,12 +31,12 @@ if (Ab != NULL) { // A is bitmap - #include "GB_select_bitmap_bitmap_template.c" + #include "template/GB_select_bitmap_bitmap_template.c" } else { // A is full - #include "GB_select_bitmap_full_template.c" + #include "template/GB_select_bitmap_full_template.c" } } #endif diff --git a/GraphBLAS/Source/Template/GB_select_entry_phase1_template.c b/GraphBLAS/Source/select/template/GB_select_entry_phase1_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_select_entry_phase1_template.c rename to GraphBLAS/Source/select/template/GB_select_entry_phase1_template.c diff --git a/GraphBLAS/Source/Template/GB_select_phase2.c b/GraphBLAS/Source/select/template/GB_select_phase2.c similarity index 100% rename from GraphBLAS/Source/Template/GB_select_phase2.c rename to GraphBLAS/Source/select/template/GB_select_phase2.c diff --git a/GraphBLAS/Source/Template/GB_select_positional_phase1_template.c b/GraphBLAS/Source/select/template/GB_select_positional_phase1_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_select_positional_phase1_template.c rename to GraphBLAS/Source/select/template/GB_select_positional_phase1_template.c diff --git a/GraphBLAS/Source/GB_Semiring_new.c b/GraphBLAS/Source/semiring/GB_Semiring_new.c similarity index 97% rename from GraphBLAS/Source/GB_Semiring_new.c rename to GraphBLAS/Source/semiring/GB_Semiring_new.c index 62b17e637e..00f9d5c0fc 100644 --- a/GraphBLAS/Source/GB_Semiring_new.c +++ b/GraphBLAS/Source/semiring/GB_Semiring_new.c @@ -10,8 +10,8 @@ // The semiring struct is already allocated on input. #include "GB.h" -#include "GB_Semiring_new.h" -#include "GB_jitifyer.h" +#include "semiring/GB_Semiring_new.h" +#include "jitifyer/GB_jitifyer.h" GrB_Info GB_Semiring_new // create a semiring ( diff --git a/GraphBLAS/Source/GB_Semiring_new.h b/GraphBLAS/Source/semiring/GB_Semiring_new.h similarity index 100% rename from GraphBLAS/Source/GB_Semiring_new.h rename to GraphBLAS/Source/semiring/GB_Semiring_new.h diff --git a/GraphBLAS/Source/GrB_Semiring_free.c b/GraphBLAS/Source/semiring/GrB_Semiring_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Semiring_free.c rename to GraphBLAS/Source/semiring/GrB_Semiring_free.c diff --git a/GraphBLAS/Source/GrB_Semiring_new.c b/GraphBLAS/Source/semiring/GrB_Semiring_new.c similarity index 98% rename from GraphBLAS/Source/GrB_Semiring_new.c rename to GraphBLAS/Source/semiring/GrB_Semiring_new.c index 3ff05e5657..712889865d 100644 --- a/GraphBLAS/Source/GrB_Semiring_new.c +++ b/GraphBLAS/Source/semiring/GrB_Semiring_new.c @@ -28,7 +28,7 @@ // operator is not assumed to be commutative. #include "GB.h" -#include "GB_Semiring_new.h" +#include "semiring/GB_Semiring_new.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GxB_Semiring_add.c b/GraphBLAS/Source/semiring/GxB_Semiring_add.c similarity index 100% rename from GraphBLAS/Source/GxB_Semiring_add.c rename to GraphBLAS/Source/semiring/GxB_Semiring_add.c diff --git a/GraphBLAS/Source/GxB_Semiring_multiply.c b/GraphBLAS/Source/semiring/GxB_Semiring_multiply.c similarity index 100% rename from GraphBLAS/Source/GxB_Semiring_multiply.c rename to GraphBLAS/Source/semiring/GxB_Semiring_multiply.c diff --git a/GraphBLAS/Source/GB_deserialize.c b/GraphBLAS/Source/serialize/GB_deserialize.c similarity index 99% rename from GraphBLAS/Source/GB_deserialize.c rename to GraphBLAS/Source/serialize/GB_deserialize.c index 48254488a9..14f012b169 100644 --- a/GraphBLAS/Source/GB_deserialize.c +++ b/GraphBLAS/Source/serialize/GB_deserialize.c @@ -10,8 +10,8 @@ // A parallel decompression of a serialized blob into a GrB_Matrix. #include "GB.h" -#include "GB_get_set.h" -#include "GB_serialize.h" +#include "get_set/GB_get_set.h" +#include "serialize/GB_serialize.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_deserialize_from_blob.c b/GraphBLAS/Source/serialize/GB_deserialize_from_blob.c similarity index 98% rename from GraphBLAS/Source/GB_deserialize_from_blob.c rename to GraphBLAS/Source/serialize/GB_deserialize_from_blob.c index 66c8ac7f90..6845a324fc 100644 --- a/GraphBLAS/Source/GB_deserialize_from_blob.c +++ b/GraphBLAS/Source/serialize/GB_deserialize_from_blob.c @@ -16,9 +16,9 @@ // done by GB_deserialize, if requested. #include "GB.h" -#include "GB_serialize.h" -#include "GB_lz4.h" -#include "GB_zstd.h" +#include "serialize/GB_serialize.h" +#include "lz4_wrapper/GB_lz4.h" +#include "zstd_wrapper/GB_zstd.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_serialize.c b/GraphBLAS/Source/serialize/GB_serialize.c similarity index 99% rename from GraphBLAS/Source/GB_serialize.c rename to GraphBLAS/Source/serialize/GB_serialize.c index 2b9591c3cc..3d12478ddf 100644 --- a/GraphBLAS/Source/GB_serialize.c +++ b/GraphBLAS/Source/serialize/GB_serialize.c @@ -14,8 +14,8 @@ // estimate the size of the blob for GrB_Matrix_serializeSize. #include "GB.h" -#include "GB_get_set.h" -#include "GB_serialize.h" +#include "get_set/GB_get_set.h" +#include "serialize/GB_serialize.h" #define GB_FREE_WORKSPACE \ { \ diff --git a/GraphBLAS/Source/GB_serialize.h b/GraphBLAS/Source/serialize/GB_serialize.h similarity index 100% rename from GraphBLAS/Source/GB_serialize.h rename to GraphBLAS/Source/serialize/GB_serialize.h diff --git a/GraphBLAS/Source/GB_serialize_array.c b/GraphBLAS/Source/serialize/GB_serialize_array.c similarity index 99% rename from GraphBLAS/Source/GB_serialize_array.c rename to GraphBLAS/Source/serialize/GB_serialize_array.c index 69efd4dbd4..4da9f67a02 100644 --- a/GraphBLAS/Source/GB_serialize_array.c +++ b/GraphBLAS/Source/serialize/GB_serialize_array.c @@ -14,9 +14,9 @@ // compressed. Currently, only LZ4, LZ4HC, and ZSTD are supported. #include "GB.h" -#include "GB_serialize.h" -#include "GB_lz4.h" -#include "GB_zstd.h" +#include "serialize/GB_serialize.h" +#include "lz4_wrapper/GB_lz4.h" +#include "zstd_wrapper/GB_zstd.h" #define GB_FREE_ALL \ { \ diff --git a/GraphBLAS/Source/GB_serialize_free_blocks.c b/GraphBLAS/Source/serialize/GB_serialize_free_blocks.c similarity index 97% rename from GraphBLAS/Source/GB_serialize_free_blocks.c rename to GraphBLAS/Source/serialize/GB_serialize_free_blocks.c index 4641c36018..eb7896c3cb 100644 --- a/GraphBLAS/Source/GB_serialize_free_blocks.c +++ b/GraphBLAS/Source/serialize/GB_serialize_free_blocks.c @@ -10,7 +10,7 @@ // Free the Blocks constructed by GB_serialize_array. #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" void GB_serialize_free_blocks ( diff --git a/GraphBLAS/Source/GB_serialize_method.c b/GraphBLAS/Source/serialize/GB_serialize_method.c similarity index 98% rename from GraphBLAS/Source/GB_serialize_method.c rename to GraphBLAS/Source/serialize/GB_serialize_method.c index 927bb21a9c..58affe4b0a 100644 --- a/GraphBLAS/Source/GB_serialize_method.c +++ b/GraphBLAS/Source/serialize/GB_serialize_method.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" void GB_serialize_method ( diff --git a/GraphBLAS/Source/GB_serialize_to_blob.c b/GraphBLAS/Source/serialize/GB_serialize_to_blob.c similarity index 98% rename from GraphBLAS/Source/GB_serialize_to_blob.c rename to GraphBLAS/Source/serialize/GB_serialize_to_blob.c index c78c4c8b7d..80d7ca2418 100644 --- a/GraphBLAS/Source/GB_serialize_to_blob.c +++ b/GraphBLAS/Source/serialize/GB_serialize_to_blob.c @@ -10,7 +10,7 @@ // JIT: not needed. Only one variant possible. #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" void GB_serialize_to_blob ( diff --git a/GraphBLAS/Source/GrB_Matrix_deserialize.c b/GraphBLAS/Source/serialize/GrB_Matrix_deserialize.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_deserialize.c rename to GraphBLAS/Source/serialize/GrB_Matrix_deserialize.c index 7b99304674..4bb59529b3 100644 --- a/GraphBLAS/Source/GrB_Matrix_deserialize.c +++ b/GraphBLAS/Source/serialize/GrB_Matrix_deserialize.c @@ -13,7 +13,7 @@ // a descriptor as the last parameter. #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GrB_Matrix_deserialize // deserialize blob into a GrB_Matrix ( diff --git a/GraphBLAS/Source/GrB_Matrix_serialize.c b/GraphBLAS/Source/serialize/GrB_Matrix_serialize.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_serialize.c rename to GraphBLAS/Source/serialize/GrB_Matrix_serialize.c index fb47aeea45..7509761f46 100644 --- a/GraphBLAS/Source/GrB_Matrix_serialize.c +++ b/GraphBLAS/Source/serialize/GrB_Matrix_serialize.c @@ -28,7 +28,7 @@ */ #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GrB_Matrix_serialize // serialize a GrB_Matrix to a blob ( diff --git a/GraphBLAS/Source/GrB_Matrix_serializeSize.c b/GraphBLAS/Source/serialize/GrB_Matrix_serializeSize.c similarity index 98% rename from GraphBLAS/Source/GrB_Matrix_serializeSize.c rename to GraphBLAS/Source/serialize/GrB_Matrix_serializeSize.c index b71acca082..aa6c57ef1b 100644 --- a/GraphBLAS/Source/GrB_Matrix_serializeSize.c +++ b/GraphBLAS/Source/serialize/GrB_Matrix_serializeSize.c @@ -13,7 +13,7 @@ // using the dryrun option in GB_serialize. #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GrB_Matrix_serializeSize // estimate the size of a blob ( diff --git a/GraphBLAS/Source/GxB_Matrix_deserialize.c b/GraphBLAS/Source/serialize/GxB_Matrix_deserialize.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_deserialize.c rename to GraphBLAS/Source/serialize/GxB_Matrix_deserialize.c index 59779cab97..11856d0058 100644 --- a/GraphBLAS/Source/GxB_Matrix_deserialize.c +++ b/GraphBLAS/Source/serialize/GxB_Matrix_deserialize.c @@ -13,7 +13,7 @@ // a descriptor as the last parameter, to control the # of threads used. #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GxB_Matrix_deserialize // deserialize blob into a GrB_Matrix ( diff --git a/GraphBLAS/Source/GxB_Matrix_serialize.c b/GraphBLAS/Source/serialize/GxB_Matrix_serialize.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_serialize.c rename to GraphBLAS/Source/serialize/GxB_Matrix_serialize.c index 7674c64c24..e9f3dcdb4d 100644 --- a/GraphBLAS/Source/GxB_Matrix_serialize.c +++ b/GraphBLAS/Source/serialize/GxB_Matrix_serialize.c @@ -31,7 +31,7 @@ */ #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GxB_Matrix_serialize // serialize a GrB_Matrix to a blob ( diff --git a/GraphBLAS/Source/GxB_Vector_deserialize.c b/GraphBLAS/Source/serialize/GxB_Vector_deserialize.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_deserialize.c rename to GraphBLAS/Source/serialize/GxB_Vector_deserialize.c index 7c3830083d..5e0a8c08af 100644 --- a/GraphBLAS/Source/GxB_Vector_deserialize.c +++ b/GraphBLAS/Source/serialize/GxB_Vector_deserialize.c @@ -13,7 +13,7 @@ // a descriptor as the last parameter, to control the # of threads used. #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GxB_Vector_deserialize // deserialize blob into a GrB_Vector ( diff --git a/GraphBLAS/Source/GxB_Vector_serialize.c b/GraphBLAS/Source/serialize/GxB_Vector_serialize.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_serialize.c rename to GraphBLAS/Source/serialize/GxB_Vector_serialize.c index ab8de201f4..3b9deb4b4c 100644 --- a/GraphBLAS/Source/GxB_Vector_serialize.c +++ b/GraphBLAS/Source/serialize/GxB_Vector_serialize.c @@ -31,7 +31,7 @@ */ #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" GrB_Info GxB_Vector_serialize // serialize a GrB_Vector to a blob ( diff --git a/GraphBLAS/Source/GxB_deserialize_type_name.c b/GraphBLAS/Source/serialize/GxB_deserialize_type_name.c similarity index 99% rename from GraphBLAS/Source/GxB_deserialize_type_name.c rename to GraphBLAS/Source/serialize/GxB_deserialize_type_name.c index 8ef32fb32b..e06f41d47b 100644 --- a/GraphBLAS/Source/GxB_deserialize_type_name.c +++ b/GraphBLAS/Source/serialize/GxB_deserialize_type_name.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_serialize.h" +#include "serialize/GB_serialize.h" // This method is historical; use GrB_get instead. diff --git a/GraphBLAS/Source/GB_eslice.c b/GraphBLAS/Source/slice/GB_e_slice.c similarity index 92% rename from GraphBLAS/Source/GB_eslice.c rename to GraphBLAS/Source/slice/GB_e_slice.c index 1839e129df..1f8798acc1 100644 --- a/GraphBLAS/Source/GB_eslice.c +++ b/GraphBLAS/Source/slice/GB_e_slice.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_eslice: equal partition of e items to each task +// GB_e_slice: equal partition of e items to each task //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -12,7 +12,7 @@ #include "GB.h" -void GB_eslice +void GB_e_slice ( int64_t *Slice, // array of size ntasks+1 int64_t e, // number items to partition amongst the tasks diff --git a/GraphBLAS/Source/GB_ek_slice.c b/GraphBLAS/Source/slice/GB_ek_slice.c similarity index 83% rename from GraphBLAS/Source/GB_ek_slice.c rename to GraphBLAS/Source/slice/GB_ek_slice.c index 9a8c320f9e..296b18b317 100644 --- a/GraphBLAS/Source/GB_ek_slice.c +++ b/GraphBLAS/Source/slice/GB_ek_slice.c @@ -22,8 +22,20 @@ // A can have any sparsity structure (sparse, hyper, bitmap, or full). // A may be jumbled. -#include "GB_ek_slice.h" -#include "GB_ek_slice_search.c" +#include "slice/GB_ek_slice.h" +#include "slice/factory/GB_ek_slice_search.c" + +#if 0 +#define GB_CALLBACK_EK_SLICE_PROTO(GX_ek_slice) \ +void GX_ek_slice /* slice a matrix */ \ +( \ + /* output: */ \ + int64_t *restrict A_ek_slicing, /* size 3*ntasks+1 */ \ + /* input: */ \ + GrB_Matrix A, /* matrix to slice */ \ + int ntasks /* # of tasks */ \ +) +#endif GB_CALLBACK_EK_SLICE_PROTO (GB_ek_slice) { @@ -77,7 +89,7 @@ GB_CALLBACK_EK_SLICE_PROTO (GB_ek_slice) //-------------------------------------------------------------------------- // FUTURE: this can be done in parallel if there are many tasks - GB_eslice (pstart_slice, anz, ntasks) ; + GB_e_slice (pstart_slice, anz, ntasks) ; //-------------------------------------------------------------------------- // find the first and last vectors in each slice diff --git a/GraphBLAS/Source/GB_ek_slice.h b/GraphBLAS/Source/slice/GB_ek_slice.h similarity index 77% rename from GraphBLAS/Source/GB_ek_slice.h rename to GraphBLAS/Source/slice/GB_ek_slice.h index 17325e7dca..42d8072039 100644 --- a/GraphBLAS/Source/GB_ek_slice.h +++ b/GraphBLAS/Source/slice/GB_ek_slice.h @@ -32,17 +32,17 @@ void GB_ek_slice_merge2 // merge final results for matrix C ( // output - int64_t *C_nvec_nonempty, // # of non-empty vectors in C - int64_t *restrict Cp_kfirst, // size ntasks + int64_t *C_nvec_nonempty, // # of non-empty vectors in C + int64_t *restrict Cp_kfirst, // size ntasks // input/output - int64_t *restrict Cp, // size cnvec+1 + int64_t *restrict Cp, // size cnvec+1 // input const int64_t cnvec, - const int64_t *restrict Wfirst, // size ntasks - const int64_t *restrict Wlast, // size ntasks - const int64_t *ek_slicing, // size 3*ntasks+1 - const int ntasks, // # of tasks used to construct C - const int nthreads, // # of threads to use + const int64_t *restrict Wfirst, // size ntasks + const int64_t *restrict Wlast, // size ntasks + const int64_t *A_ek_slicing, // size 3*ntasks+1 + const int ntasks, // # of tasks used to construct C + const int nthreads, // # of threads to use GB_Werk Werk ) ; @@ -52,6 +52,13 @@ void GB_ek_slice_merge2 // merge final results for matrix C // The tasks were generated by GB_ek_slice. +// GB_get_pA_and_pC is no longer used. JIT kernels and templates use +// use the GB_GET_PA_AND_PC macro instead, #define'd in +// Source/slice/include/GB_ek_slice_kernels.h. + +// FIXME: replace GB_GET_PA_AND_PC with this static inline function and use +// this instead (but without the assignment of p0 and p1). + #if 0 static inline void GB_get_pA_and_pC ( @@ -73,6 +80,7 @@ static inline void GB_get_pA_and_pC ) { + // get the start of vector k and k+1 (does not appear in GB_GET_PA_AND_PC) int64_t p0 = GBP (Ap, k, avlen) ; int64_t p1 = GBP (Ap, k+1, avlen) ; @@ -106,6 +114,15 @@ static inline void GB_get_pA_and_pC // The tasks were generated by GB_ek_slice. +// GB_get_pA is only used for non-templatized factory methods, not in any JIT +// kernels or templates. JIT kernels and templates use the GB_GET_PA macro +// instead, #define'd in Source/slice/include/GB_ek_slice_kernels.h. + +// GB_get_pA and GB_GET_PA are very similar, except that GB_get_pA computes +// p0 and p1. + +// FIXME: unify GB_get_pA and GB_GET_PA into a single method. + static inline void GB_get_pA ( // output @@ -122,6 +139,7 @@ static inline void GB_get_pA ) { + // get the start of vector k and k+1 (does not appear in GB_GET_PA) int64_t p0 = GBP (Ap, k, avlen) ; int64_t p1 = GBP (Ap, k+1, avlen) ; diff --git a/GraphBLAS/Source/GB_ek_slice_merge1.c b/GraphBLAS/Source/slice/GB_ek_slice_merge1.c similarity index 77% rename from GraphBLAS/Source/GB_ek_slice_merge1.c rename to GraphBLAS/Source/slice/GB_ek_slice_merge1.c index 86669d4b5b..b5df69c0f6 100644 --- a/GraphBLAS/Source/GB_ek_slice_merge1.c +++ b/GraphBLAS/Source/slice/GB_ek_slice_merge1.c @@ -22,7 +22,21 @@ // This function sums up the entries computed for C(:,k) by all tasks, so that // on output, Cp [k] is the total count of entries in C(:,k). -#include "GB_ek_slice.h" +#include "slice/GB_ek_slice.h" + +#if 0 +#define GB_CALLBACK_EK_SLICE_MERGE1_PROTO(GX_ek_slice_merge1) \ +void GX_ek_slice_merge1 /* merge column counts for the matrix C */ \ +( \ + /* input/output: */ \ + int64_t *restrict Cp, /* column counts */ \ + /* input: */ \ + const int64_t *restrict Wfirst, /* size A_ntasks */ \ + const int64_t *restrict Wlast, /* size A_ntasks */ \ + const int64_t *A_ek_slicing, /* size 3*A_ntasks+1 */ \ + const int A_ntasks /* # of tasks */ \ +) +#endif GB_CALLBACK_EK_SLICE_MERGE1_PROTO (GB_ek_slice_merge1) { diff --git a/GraphBLAS/Source/GB_ek_slice_merge2.c b/GraphBLAS/Source/slice/GB_ek_slice_merge2.c similarity index 88% rename from GraphBLAS/Source/GB_ek_slice_merge2.c rename to GraphBLAS/Source/slice/GB_ek_slice_merge2.c index 33b711f2e2..dde979d414 100644 --- a/GraphBLAS/Source/GB_ek_slice_merge2.c +++ b/GraphBLAS/Source/slice/GB_ek_slice_merge2.c @@ -31,22 +31,22 @@ // operate on C(:,klast). In both cases, task tid starts its computations at // the top of C(:,klast), which can be found at Cp [klast]. -#include "GB_ek_slice.h" +#include "slice/GB_ek_slice.h" void GB_ek_slice_merge2 // merge final results for matrix C ( // output - int64_t *C_nvec_nonempty, // # of non-empty vectors in C - int64_t *restrict Cp_kfirst, // size ntasks + int64_t *C_nvec_nonempty, // # of non-empty vectors in C + int64_t *restrict Cp_kfirst, // size ntasks // input/output - int64_t *restrict Cp, // size cnvec+1 + int64_t *restrict Cp, // size cnvec+1 // input const int64_t cnvec, - const int64_t *restrict Wfirst, // size ntasks - const int64_t *restrict Wlast, // size ntasks - const int64_t *A_ek_slicing, // size 3*ntasks+1 - const int ntasks, // # of tasks used to construct C - const int nthreads, // # of threads to use + const int64_t *restrict Wfirst, // size ntasks + const int64_t *restrict Wlast, // size ntasks + const int64_t *A_ek_slicing, // size 3*ntasks+1 + const int ntasks, // # of tasks used to construct C + const int nthreads, // # of threads to use GB_Werk Werk ) { diff --git a/GraphBLAS/Source/GB_ewise_slice.c b/GraphBLAS/Source/slice/GB_ewise_slice.c similarity index 99% rename from GraphBLAS/Source/GB_ewise_slice.c rename to GraphBLAS/Source/slice/GB_ewise_slice.c index 623194cc5b..4868b1e261 100644 --- a/GraphBLAS/Source/GB_ewise_slice.c +++ b/GraphBLAS/Source/slice/GB_ewise_slice.c @@ -289,7 +289,7 @@ GrB_Info GB_ewise_slice GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (Coarse, Cwork, Cnvec, ntasks1, false) ; + GB_p_slice (Coarse, Cwork, Cnvec, ntasks1, false) ; //-------------------------------------------------------------------------- // construct all tasks, both coarse and fine diff --git a/GraphBLAS/Source/GB_pslice.c b/GraphBLAS/Source/slice/GB_p_slice.c similarity index 92% rename from GraphBLAS/Source/GB_pslice.c rename to GraphBLAS/Source/slice/GB_p_slice.c index e0f8e5e926..09706fd94d 100644 --- a/GraphBLAS/Source/GB_pslice.c +++ b/GraphBLAS/Source/slice/GB_p_slice.c @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_pslice: partition Ap for a set of tasks +// GB_p_slice: partition Ap for a set of tasks //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -19,10 +19,10 @@ #include "GB.h" //------------------------------------------------------------------------------ -// GB_pslice_worker: partition Ap for a set of tasks +// GB_p_slice_worker: partition Ap for a set of tasks //------------------------------------------------------------------------------ -static void GB_pslice_worker +static void GB_p_slice_worker ( int64_t *restrict Slice, // size ntasks+1 const int64_t *restrict Ap, // array size n+1 @@ -100,23 +100,25 @@ static void GB_pslice_worker if (tlo < t-1) { - GB_pslice_worker (Slice, Ap, tlo, t) ; + GB_p_slice_worker (Slice, Ap, tlo, t) ; } if (t < thi-1) { - GB_pslice_worker (Slice, Ap, t, thi) ; + GB_p_slice_worker (Slice, Ap, t, thi) ; } } } //------------------------------------------------------------------------------ -// GB_pslice: partition Ap for a set of tasks +// GB_p_slice: partition Ap for a set of tasks //------------------------------------------------------------------------------ -void GB_pslice // slice Ap +void GB_p_slice // slice Ap ( - int64_t *restrict Slice, // size ntasks+1 - const int64_t *restrict Ap, // array size n+1 (NULL if full or bitmap) + // output: + int64_t *restrict Slice, // size ntasks+1 + // input: + const int64_t *restrict Ap, // array size n+1 (NULL if full or bitmap) const int64_t n, const int ntasks, // # of tasks const bool perfectly_balanced @@ -146,7 +148,7 @@ void GB_pslice // slice Ap // A is full or bitmap: slice 0:n equally for all tasks //---------------------------------------------------------------------- - GB_eslice (Slice, n, ntasks) ; + GB_e_slice (Slice, n, ntasks) ; } else @@ -190,7 +192,7 @@ void GB_pslice // slice Ap // this is much faster, and results in good load balancing if // there is more than one task per thread, and dynamic // scheduling is used. - GB_pslice_worker (Slice, Ap, 0, ntasks) ; + GB_p_slice_worker (Slice, Ap, 0, ntasks) ; } } } diff --git a/GraphBLAS/Source/GB_slice.h b/GraphBLAS/Source/slice/GB_slice.h similarity index 72% rename from GraphBLAS/Source/GB_slice.h rename to GraphBLAS/Source/slice/GB_slice.h index e23b35e6c9..6115df54c4 100644 --- a/GraphBLAS/Source/GB_slice.h +++ b/GraphBLAS/Source/slice/GB_slice.h @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// GB_slice.h: definitions for GB_eslice and GB_pslice +// GB_slice.h: definitions for GB_e_slice and GB_p_slice //------------------------------------------------------------------------------ // SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. @@ -10,16 +10,18 @@ #ifndef GB_SLICE_H #define GB_SLICE_H -void GB_pslice // slice Ap +void GB_p_slice // slice Ap ( - int64_t *restrict Slice, // size ntasks+1 - const int64_t *restrict Ap, // array size n+1 (NULL if full or bitmap) + // output: + int64_t *restrict Slice, // size ntasks+1 + // input: + const int64_t *restrict Ap, // array size n+1 (NULL if full or bitmap) const int64_t n, const int ntasks, // # of tasks const bool perfectly_balanced ) ; -void GB_eslice +void GB_e_slice ( // output: int64_t *Slice, // array of size ntasks+1 diff --git a/GraphBLAS/Source/GB_slice_vector.c b/GraphBLAS/Source/slice/GB_slice_vector.c similarity index 100% rename from GraphBLAS/Source/GB_slice_vector.c rename to GraphBLAS/Source/slice/GB_slice_vector.c diff --git a/GraphBLAS/Source/GB_task_cumsum.c b/GraphBLAS/Source/slice/GB_task_cumsum.c similarity index 100% rename from GraphBLAS/Source/GB_task_cumsum.c rename to GraphBLAS/Source/slice/GB_task_cumsum.c diff --git a/GraphBLAS/Source/GB_task_methods.h b/GraphBLAS/Source/slice/GB_task_methods.h similarity index 99% rename from GraphBLAS/Source/GB_task_methods.h rename to GraphBLAS/Source/slice/GB_task_methods.h index 718e415e7c..b4bb248829 100644 --- a/GraphBLAS/Source/GB_task_methods.h +++ b/GraphBLAS/Source/slice/GB_task_methods.h @@ -29,7 +29,7 @@ // The GB_subassign functions use the TaskList, in many different ways. // typedef GB_task_struct: -#include "GB_task_struct.h" +#include "include/GB_task_struct.h" // GB_REALLOC_TASK_WORK: Allocate or reallocate the TaskList so that it can // hold at least ntasks. Double the size if it's too small. diff --git a/GraphBLAS/Source/Factories/GB_ek_slice_search.c b/GraphBLAS/Source/slice/factory/GB_ek_slice_search.c similarity index 97% rename from GraphBLAS/Source/Factories/GB_ek_slice_search.c rename to GraphBLAS/Source/slice/factory/GB_ek_slice_search.c index 67fb8e3ed5..968e4d4742 100644 --- a/GraphBLAS/Source/Factories/GB_ek_slice_search.c +++ b/GraphBLAS/Source/slice/factory/GB_ek_slice_search.c @@ -9,7 +9,7 @@ #ifndef GB_EK_SLICE_SEARCH_H #define GB_EK_SLICE_SEARCH_H -#include "GB_search_for_vector_template.c" +#include "slice/factory/GB_search_for_vector_template.c" static inline void GB_ek_slice_search ( diff --git a/GraphBLAS/Source/Factories/GB_search_for_vector_template.c b/GraphBLAS/Source/slice/factory/GB_search_for_vector_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_search_for_vector_template.c rename to GraphBLAS/Source/slice/factory/GB_search_for_vector_template.c diff --git a/GraphBLAS/Source/Template/GB_ek_slice_kernels.h b/GraphBLAS/Source/slice/include/GB_ek_slice_kernels.h similarity index 100% rename from GraphBLAS/Source/Template/GB_ek_slice_kernels.h rename to GraphBLAS/Source/slice/include/GB_ek_slice_kernels.h diff --git a/GraphBLAS/Source/Shared/GB_partition.h b/GraphBLAS/Source/slice/include/GB_partition.h similarity index 100% rename from GraphBLAS/Source/Shared/GB_partition.h rename to GraphBLAS/Source/slice/include/GB_partition.h diff --git a/GraphBLAS/Source/Template/GB_task_struct.h b/GraphBLAS/Source/slice/include/GB_task_struct.h similarity index 100% rename from GraphBLAS/Source/Template/GB_task_struct.h rename to GraphBLAS/Source/slice/include/GB_task_struct.h diff --git a/GraphBLAS/Source/GB_msort_1.c b/GraphBLAS/Source/sort/GB_msort_1.c similarity index 99% rename from GraphBLAS/Source/GB_msort_1.c rename to GraphBLAS/Source/sort/GB_msort_1.c index f39764c047..c11ba60a3f 100644 --- a/GraphBLAS/Source/GB_msort_1.c +++ b/GraphBLAS/Source/sort/GB_msort_1.c @@ -11,7 +11,7 @@ // A parallel mergesort of an array of 1-by-n integers. -#include "GB_msort_1.h" +#include "sort/GB_msort_1.h" //------------------------------------------------------------------------------ // GB_msort_1_binary_search: binary search for the pivot @@ -346,7 +346,7 @@ GrB_Info GB_msort_1 // sort array A of size 1-by-n // partition and sort the leaves //-------------------------------------------------------------------------- - GB_eslice (Slice, n, ntasks) ; + GB_e_slice (Slice, n, ntasks) ; int tid ; #pragma omp parallel for num_threads(nthreads) schedule(dynamic,1) for (tid = 0 ; tid < ntasks ; tid++) diff --git a/GraphBLAS/Source/GB_msort_1.h b/GraphBLAS/Source/sort/GB_msort_1.h similarity index 98% rename from GraphBLAS/Source/GB_msort_1.h rename to GraphBLAS/Source/sort/GB_msort_1.h index abda154102..a8109e32ef 100644 --- a/GraphBLAS/Source/GB_msort_1.h +++ b/GraphBLAS/Source/sort/GB_msort_1.h @@ -10,7 +10,7 @@ // A parallel mergesort of an array of 2-by-n integers. Each key consists // of two integers. -#include "GB_sort.h" +#include "sort/GB_sort.h" //------------------------------------------------------------------------------ // prototypes only needed for GB_msort_1 diff --git a/GraphBLAS/Source/GB_msort_2.c b/GraphBLAS/Source/sort/GB_msort_2.c similarity index 99% rename from GraphBLAS/Source/GB_msort_2.c rename to GraphBLAS/Source/sort/GB_msort_2.c index 45b1e43408..50172242f0 100644 --- a/GraphBLAS/Source/GB_msort_2.c +++ b/GraphBLAS/Source/sort/GB_msort_2.c @@ -12,7 +12,7 @@ // A parallel mergesort of an array of 2-by-n integers. Each key // consists of two integers. -#include "GB_msort_2.h" +#include "sort/GB_msort_2.h" //------------------------------------------------------------------------------ // GB_msort_2_binary_search: binary search for the pivot @@ -360,7 +360,7 @@ GrB_Info GB_msort_2 // sort array A of size 2-by-n, using 2 keys (A [0:1][]) // partition and sort the leaves //-------------------------------------------------------------------------- - GB_eslice (Slice, n, ntasks) ; + GB_e_slice (Slice, n, ntasks) ; int tid ; #pragma omp parallel for num_threads(nthreads) schedule(dynamic,1) for (tid = 0 ; tid < ntasks ; tid++) diff --git a/GraphBLAS/Source/GB_msort_2.h b/GraphBLAS/Source/sort/GB_msort_2.h similarity index 98% rename from GraphBLAS/Source/GB_msort_2.h rename to GraphBLAS/Source/sort/GB_msort_2.h index 8b303c1165..ca8ed87bc5 100644 --- a/GraphBLAS/Source/GB_msort_2.h +++ b/GraphBLAS/Source/sort/GB_msort_2.h @@ -10,7 +10,7 @@ // A parallel mergesort of an array of 2-by-n integers. Each key consists // of two integers. -#include "GB_sort.h" +#include "sort/GB_sort.h" //------------------------------------------------------------------------------ // prototypes only needed for GB_msort_2 diff --git a/GraphBLAS/Source/GB_msort_3.c b/GraphBLAS/Source/sort/GB_msort_3.c similarity index 99% rename from GraphBLAS/Source/GB_msort_3.c rename to GraphBLAS/Source/sort/GB_msort_3.c index 22502b3767..2de5194ae2 100644 --- a/GraphBLAS/Source/GB_msort_3.c +++ b/GraphBLAS/Source/sort/GB_msort_3.c @@ -12,7 +12,7 @@ // A parallel mergesort of an array of 3-by-n integers. Each key // consists of three integers. -#include "GB_msort_3.h" +#include "sort/GB_msort_3.h" //------------------------------------------------------------------------------ // GB_msort_3_binary_search: binary search for the pivot @@ -373,7 +373,7 @@ GrB_Info GB_msort_3 // sort array A of size 3-by-n, using 3 keys (A [0:2][]) // partition and sort the leaves //-------------------------------------------------------------------------- - GB_eslice (Slice, n, ntasks) ; + GB_e_slice (Slice, n, ntasks) ; int tid ; #pragma omp parallel for num_threads(nthreads) schedule(dynamic,1) for (tid = 0 ; tid < ntasks ; tid++) diff --git a/GraphBLAS/Source/GB_msort_3.h b/GraphBLAS/Source/sort/GB_msort_3.h similarity index 98% rename from GraphBLAS/Source/GB_msort_3.h rename to GraphBLAS/Source/sort/GB_msort_3.h index 435e978546..a80abd7669 100644 --- a/GraphBLAS/Source/GB_msort_3.h +++ b/GraphBLAS/Source/sort/GB_msort_3.h @@ -10,7 +10,7 @@ // A parallel mergesort of an array of 3-by-n integers. Each key consists // of three integers. -#include "GB_sort.h" +#include "sort/GB_sort.h" //------------------------------------------------------------------------------ // prototypes only needed for GB_msort_3 diff --git a/GraphBLAS/Source/GB_qsort_1.c b/GraphBLAS/Source/sort/GB_qsort_1.c similarity index 95% rename from GraphBLAS/Source/GB_qsort_1.c rename to GraphBLAS/Source/sort/GB_qsort_1.c index c78bfaa841..89c0eb5f3c 100644 --- a/GraphBLAS/Source/GB_qsort_1.c +++ b/GraphBLAS/Source/sort/GB_qsort_1.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_sort.h" +#include "sort/GB_sort.h" // returns true if A [a] < B [b] #define GB_lt(A,a,B,b) \ @@ -37,7 +37,7 @@ #define GB_partition GB_partition_1 #define GB_quicksort GB_quicksort_1 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" GB_CALLBACK_QSORT_1_PROTO (GB_qsort_1) { diff --git a/GraphBLAS/Source/GB_qsort_1b.c b/GraphBLAS/Source/sort/GB_qsort_1b.c similarity index 95% rename from GraphBLAS/Source/GB_qsort_1b.c rename to GraphBLAS/Source/sort/GB_qsort_1b.c index 75a316a5b7..76dae1b833 100644 --- a/GraphBLAS/Source/GB_qsort_1b.c +++ b/GraphBLAS/Source/sort/GB_qsort_1b.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_sort.h" +#include "sort/GB_sort.h" // returns true if A [a] < B [b] #define GB_lt(A,a,B,b) GB_lt_1 (A ## _0, a, B ## _0, b) @@ -46,7 +46,7 @@ #define GB_partition GB_partition_1b #define GB_quicksort GB_quicksort_1b -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_1b // sort array A of size 2-by-n, using 1 key (A [0][]) ( @@ -97,7 +97,7 @@ void GB_qsort_1b // sort array A of size 2-by-n, using 1 key (A [0][]) #undef GB_quicksort #define GB_quicksort GB_quicksort_1b_size1 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_1b_size1 // GB_qsort_1b with A_1 with sizeof = 1 ( @@ -123,7 +123,7 @@ void GB_qsort_1b_size1 // GB_qsort_1b with A_1 with sizeof = 1 #undef GB_quicksort #define GB_quicksort GB_quicksort_1b_size2 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_1b_size2 // GB_qsort_1b with A_1 with sizeof = 2 ( @@ -150,7 +150,7 @@ void GB_qsort_1b_size2 // GB_qsort_1b with A_1 with sizeof = 2 #undef GB_quicksort #define GB_quicksort GB_quicksort_1b_size4 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_1b_size4 // GB_qsort_1b with A_1 with sizeof = 4 ( @@ -177,7 +177,7 @@ void GB_qsort_1b_size4 // GB_qsort_1b with A_1 with sizeof = 4 #undef GB_quicksort #define GB_quicksort GB_quicksort_1b_size8 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_1b_size8 // GB_qsort_1b with A_1 with sizeof = 8 ( @@ -203,7 +203,7 @@ void GB_qsort_1b_size8 // GB_qsort_1b with A_1 with sizeof = 8 #undef GB_quicksort #define GB_quicksort GB_quicksort_1b_size16 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_1b_size16 // GB_qsort_1b with A_1 with sizeof = 16 ( diff --git a/GraphBLAS/Source/GB_qsort_2.c b/GraphBLAS/Source/sort/GB_qsort_2.c similarity index 96% rename from GraphBLAS/Source/GB_qsort_2.c rename to GraphBLAS/Source/sort/GB_qsort_2.c index b777d7182a..8023684251 100644 --- a/GraphBLAS/Source/GB_qsort_2.c +++ b/GraphBLAS/Source/sort/GB_qsort_2.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_sort.h" +#include "sort/GB_sort.h" // returns true if A [a] < B [b] #define GB_lt(A,a,B,b) \ @@ -39,7 +39,7 @@ #define GB_partition GB_partition_2 #define GB_quicksort GB_quicksort_2 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_2 // sort array A of size 2-by-n, using 2 keys (A [0:1][]) ( diff --git a/GraphBLAS/Source/GB_qsort_3.c b/GraphBLAS/Source/sort/GB_qsort_3.c similarity index 96% rename from GraphBLAS/Source/GB_qsort_3.c rename to GraphBLAS/Source/sort/GB_qsort_3.c index 9d0eca6611..cd978017f3 100644 --- a/GraphBLAS/Source/GB_qsort_3.c +++ b/GraphBLAS/Source/sort/GB_qsort_3.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_sort.h" +#include "sort/GB_sort.h" // returns true if A [a] < B [b] #define GB_lt(A,a,B,b) \ @@ -41,7 +41,7 @@ #define GB_partition GB_partition_3 #define GB_quicksort GB_quicksort_3 -#include "GB_qsort_template.c" +#include "sort/factory/GB_qsort_template.c" void GB_qsort_3 // sort array A of size 3-by-n, using 3 keys (A [0:2][]) ( diff --git a/GraphBLAS/Source/GB_sort.c b/GraphBLAS/Source/sort/GB_sort.c similarity index 94% rename from GraphBLAS/Source/GB_sort.c rename to GraphBLAS/Source/sort/GB_sort.c index 9af105fefe..45954c17a1 100644 --- a/GraphBLAS/Source/GB_sort.c +++ b/GraphBLAS/Source/sort/GB_sort.c @@ -9,9 +9,9 @@ // JIT: needed. -#include "GB_sort.h" -#include "GB_transpose.h" -#include "GB_ek_slice.h" +#include "sort/GB_sort.h" +#include "transpose/GB_transpose.h" +#include "slice/GB_ek_slice.h" // macros: @@ -47,47 +47,47 @@ #define GB_TYPE bool #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_BOOL) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int8_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_INT8) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int16_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_INT16) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int32_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_INT32) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int64_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_INT64) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint8_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_UINT8) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint16_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_UINT16) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint32_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_UINT32) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint64_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_UINT64) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE float #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_FP32) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE double #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _ascend_FP64) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" //------------------------------------------------------------------------------ // descending sort for built-in types @@ -99,47 +99,47 @@ #define GB_TYPE bool #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_BOOL) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int8_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_INT8) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int16_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_INT16) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int32_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_INT32) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE int64_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_INT64) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint8_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_UINT8) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint16_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_UINT16) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint32_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_UINT32) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE uint64_t #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_UINT64) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE float #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_FP32) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" #define GB_TYPE double #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _descend_FP64) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" //------------------------------------------------------------------------------ // macros for user-defined types and when typecasting is performed @@ -182,7 +182,7 @@ #undef GB_SORT_UDT #define GB_SORT_UDT 1 #define GB_SORT(func) GB_EVAL3 (GB(sort_), func, _UDT) -#include "GB_sort_template.c" +#include "sort/factory/GB_sort_template.c" //------------------------------------------------------------------------------ // GB_sort @@ -204,7 +204,7 @@ } // redefine to use the revised GB_FREE_ALL above: -#include "GB_static_header.h" +#include "matrix/GB_static_header.h" GrB_Info GB_sort ( diff --git a/GraphBLAS/Source/GB_sort.h b/GraphBLAS/Source/sort/GB_sort.h similarity index 100% rename from GraphBLAS/Source/GB_sort.h rename to GraphBLAS/Source/sort/GB_sort.h diff --git a/GraphBLAS/Source/GxB_Matrix_sort.c b/GraphBLAS/Source/sort/GxB_Matrix_sort.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_sort.c rename to GraphBLAS/Source/sort/GxB_Matrix_sort.c index 0171373a95..b47b66ba1d 100644 --- a/GraphBLAS/Source/GxB_Matrix_sort.c +++ b/GraphBLAS/Source/sort/GxB_Matrix_sort.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_sort.h" +#include "sort/GB_sort.h" GrB_Info GxB_Matrix_sort ( diff --git a/GraphBLAS/Source/GxB_Vector_sort.c b/GraphBLAS/Source/sort/GxB_Vector_sort.c similarity index 98% rename from GraphBLAS/Source/GxB_Vector_sort.c rename to GraphBLAS/Source/sort/GxB_Vector_sort.c index 8d57dc2340..593aec9f2c 100644 --- a/GraphBLAS/Source/GxB_Vector_sort.c +++ b/GraphBLAS/Source/sort/GxB_Vector_sort.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_sort.h" +#include "sort/GB_sort.h" GrB_Info GxB_Vector_sort ( diff --git a/GraphBLAS/Source/Factories/GB_qsort_template.c b/GraphBLAS/Source/sort/factory/GB_qsort_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_qsort_template.c rename to GraphBLAS/Source/sort/factory/GB_qsort_template.c diff --git a/GraphBLAS/Source/Factories/GB_sort_template.c b/GraphBLAS/Source/sort/factory/GB_sort_template.c similarity index 99% rename from GraphBLAS/Source/Factories/GB_sort_template.c rename to GraphBLAS/Source/sort/factory/GB_sort_template.c index 4af094b309..11a49fb365 100644 --- a/GraphBLAS/Source/Factories/GB_sort_template.c +++ b/GraphBLAS/Source/sort/factory/GB_sort_template.c @@ -541,7 +541,7 @@ static void GB_SORT (vector) // sort the pair of arrays A_0, A_1 // partition and sort the leaves //-------------------------------------------------------------------------- - GB_eslice (Slice, n, ntasks) ; + GB_e_slice (Slice, n, ntasks) ; int tid ; #pragma omp parallel for num_threads(nthreads) schedule(dynamic,1) for (tid = 0 ; tid < ntasks ; tid++) @@ -731,7 +731,7 @@ static GrB_Info GB_SORT (matrix) int64_t *restrict C_skip = SortTasks + ntasks ; // size ntasks+1 int64_t *restrict C_slice = SortTasks + 2*ntasks + 1; // size ntasks+1 - GB_pslice (C_slice, Cp, cnvec, ntasks, false) ; + GB_p_slice (C_slice, Cp, cnvec, ntasks, false) ; // sort all short vectors in parallel, one thread per vector int tid ; diff --git a/GraphBLAS/Source/GB_split.c b/GraphBLAS/Source/split/GB_split.c similarity index 99% rename from GraphBLAS/Source/GB_split.c rename to GraphBLAS/Source/split/GB_split.c index 0da9d8166c..5ff3ad5272 100644 --- a/GraphBLAS/Source/GB_split.c +++ b/GraphBLAS/Source/split/GB_split.c @@ -18,7 +18,7 @@ GB_Matrix_free (&(Tiles [k])) ; \ } -#include "GB_split.h" +#include "split/GB_split.h" GrB_Info GB_split // split a matrix ( diff --git a/GraphBLAS/Source/GB_split.h b/GraphBLAS/Source/split/GB_split.h similarity index 98% rename from GraphBLAS/Source/GB_split.h rename to GraphBLAS/Source/split/GB_split.h index 848e4be9d7..c086aff682 100644 --- a/GraphBLAS/Source/GB_split.h +++ b/GraphBLAS/Source/split/GB_split.h @@ -10,7 +10,7 @@ #ifndef GB_SPLIT_H #define GB_SPLIT_H #include "GB.h" -#include "GB_ek_slice.h" +#include "slice/GB_ek_slice.h" #define GB_TILE(Tiles,i,j) (*(Tiles + (i) * n + (j))) GrB_Info GB_split // split a matrix diff --git a/GraphBLAS/Source/GB_split_bitmap.c b/GraphBLAS/Source/split/GB_split_bitmap.c similarity index 92% rename from GraphBLAS/Source/GB_split_bitmap.c rename to GraphBLAS/Source/split/GB_split_bitmap.c index 09f5d10790..5f3c2c1741 100644 --- a/GraphBLAS/Source/GB_split_bitmap.c +++ b/GraphBLAS/Source/split/GB_split_bitmap.c @@ -12,9 +12,9 @@ #define GB_FREE_ALL \ GB_Matrix_free (&C) ; -#include "GB_split.h" -#include "GB_stringify.h" -#include "GB_apply.h" +#include "split/GB_split.h" +#include "jitifyer/GB_stringify.h" +#include "apply/GB_apply.h" GrB_Info GB_split_bitmap // split a bitmap matrix ( @@ -109,7 +109,7 @@ GrB_Info GB_split_bitmap // split a bitmap matrix memcpy (C->x, A->x, asize) ; #define GB_ISO_SPLIT #define GB_COPY(pC,pA) ; - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; } @@ -132,21 +132,21 @@ GrB_Info GB_split_bitmap // split a bitmap matrix case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_C_TYPE uint8_t #define GB_A_TYPE uint8_t - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user #define GB_C_TYPE uint16_t #define GB_A_TYPE uint16_t - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte user #define GB_C_TYPE uint32_t #define GB_A_TYPE uint32_t - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; break ; @@ -154,14 +154,14 @@ GrB_Info GB_split_bitmap // split a bitmap matrix // or 8-byte user defined #define GB_C_TYPE uint64_t #define GB_A_TYPE uint64_t - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user #define GB_C_TYPE GB_blob16 #define GB_A_TYPE GB_blob16 - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; break ; @@ -196,7 +196,7 @@ GrB_Info GB_split_bitmap // split a bitmap matrix #undef GB_COPY #define GB_COPY(pC,pA) \ memcpy (Cx + (pC)*asize, Ax +(pA)*asize, asize) ; - #include "GB_split_bitmap_template.c" + #include "split/template/GB_split_bitmap_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_split_full.c b/GraphBLAS/Source/split/GB_split_full.c similarity index 93% rename from GraphBLAS/Source/GB_split_full.c rename to GraphBLAS/Source/split/GB_split_full.c index 29f620ee62..f0cc974599 100644 --- a/GraphBLAS/Source/GB_split_full.c +++ b/GraphBLAS/Source/split/GB_split_full.c @@ -12,9 +12,9 @@ #define GB_FREE_ALL \ GB_Matrix_free (&C) ; -#include "GB_split.h" -#include "GB_stringify.h" -#include "GB_apply.h" +#include "split/GB_split.h" +#include "jitifyer/GB_stringify.h" +#include "apply/GB_apply.h" GrB_Info GB_split_full // split a full matrix ( @@ -125,21 +125,21 @@ GrB_Info GB_split_full // split a full matrix case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_C_TYPE uint8_t #define GB_A_TYPE uint8_t - #include "GB_split_full_template.c" + #include "split/template/GB_split_full_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user #define GB_C_TYPE uint16_t #define GB_A_TYPE uint16_t - #include "GB_split_full_template.c" + #include "split/template/GB_split_full_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte user #define GB_C_TYPE uint32_t #define GB_A_TYPE uint32_t - #include "GB_split_full_template.c" + #include "split/template/GB_split_full_template.c" info = GrB_SUCCESS ; break ; @@ -147,14 +147,14 @@ GrB_Info GB_split_full // split a full matrix // complex, or 8-byte user #define GB_C_TYPE uint64_t #define GB_A_TYPE uint64_t - #include "GB_split_full_template.c" + #include "split/template/GB_split_full_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user #define GB_C_TYPE GB_blob16 #define GB_A_TYPE GB_blob16 - #include "GB_split_full_template.c" + #include "split/template/GB_split_full_template.c" info = GrB_SUCCESS ; break ; @@ -188,7 +188,7 @@ GrB_Info GB_split_full // split a full matrix #undef GB_COPY #define GB_COPY(pC,pA) \ memcpy (Cx +(pC)*asize, Ax +(pA)*asize, asize) ; - #include "GB_split_full_template.c" + #include "split/template/GB_split_full_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GB_split_sparse.c b/GraphBLAS/Source/split/GB_split_sparse.c similarity index 95% rename from GraphBLAS/Source/GB_split_sparse.c rename to GraphBLAS/Source/split/GB_split_sparse.c index eda613b45a..d8906d49c5 100644 --- a/GraphBLAS/Source/GB_split_sparse.c +++ b/GraphBLAS/Source/split/GB_split_sparse.c @@ -17,9 +17,9 @@ GB_FREE_WORKSPACE ; \ GB_Matrix_free (&C) ; -#include "GB_split.h" -#include "GB_stringify.h" -#include "GB_apply.h" +#include "split/GB_split.h" +#include "jitifyer/GB_stringify.h" +#include "apply/GB_apply.h" GrB_Info GB_split_sparse // split a sparse matrix ( @@ -238,7 +238,7 @@ GrB_Info GB_split_sparse // split a sparse matrix memcpy (C->x, A->x, asize) ; #define GB_ISO_SPLIT #define GB_COPY(pC,pA) ; - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; } @@ -261,21 +261,21 @@ GrB_Info GB_split_sparse // split a sparse matrix case GB_1BYTE : // uint8, int8, bool, or 1-byte user #define GB_C_TYPE uint8_t #define GB_A_TYPE uint8_t - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; break ; case GB_2BYTE : // uint16, int16, or 2-byte user-defined #define GB_C_TYPE uint16_t #define GB_A_TYPE uint16_t - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; break ; case GB_4BYTE : // uint32, int32, float, or 4-byte user #define GB_C_TYPE uint32_t #define GB_A_TYPE uint32_t - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; break ; @@ -283,14 +283,14 @@ GrB_Info GB_split_sparse // split a sparse matrix // or 8-byte user defined #define GB_C_TYPE uint64_t #define GB_A_TYPE uint64_t - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; break ; case GB_16BYTE : // double complex or 16-byte user #define GB_C_TYPE GB_blob16 #define GB_A_TYPE GB_blob16 - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; break ; @@ -325,7 +325,7 @@ GrB_Info GB_split_sparse // split a sparse matrix #undef GB_COPY #define GB_COPY(pC,pA) \ memcpy (Cx + (pC)*asize, Ax +(pA)*asize, asize) ; - #include "GB_split_sparse_template.c" + #include "split/template/GB_split_sparse_template.c" info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GxB_Matrix_split.c b/GraphBLAS/Source/split/GxB_Matrix_split.c similarity index 98% rename from GraphBLAS/Source/GxB_Matrix_split.c rename to GraphBLAS/Source/split/GxB_Matrix_split.c index 8a895fa753..d37e5bc5a2 100644 --- a/GraphBLAS/Source/GxB_Matrix_split.c +++ b/GraphBLAS/Source/split/GxB_Matrix_split.c @@ -10,7 +10,7 @@ // The input matrix A is split into a 2D array of size m-by-n. The Tile{i,j} // matrix has dimension Tile_nrows[i]-by-Tile_ncols[j]. -#include "GB_split.h" +#include "split/GB_split.h" GrB_Info GxB_Matrix_split // split a matrix into 2D array of matrices ( diff --git a/GraphBLAS/Source/Template/GB_split_bitmap_template.c b/GraphBLAS/Source/split/template/GB_split_bitmap_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_split_bitmap_template.c rename to GraphBLAS/Source/split/template/GB_split_bitmap_template.c diff --git a/GraphBLAS/Source/Template/GB_split_full_template.c b/GraphBLAS/Source/split/template/GB_split_full_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_split_full_template.c rename to GraphBLAS/Source/split/template/GB_split_full_template.c diff --git a/GraphBLAS/Source/Template/GB_split_sparse_template.c b/GraphBLAS/Source/split/template/GB_split_sparse_template.c similarity index 100% rename from GraphBLAS/Source/Template/GB_split_sparse_template.c rename to GraphBLAS/Source/split/template/GB_split_sparse_template.c diff --git a/GraphBLAS/Source/GB_transplant.c b/GraphBLAS/Source/transplant/GB_transplant.c similarity index 100% rename from GraphBLAS/Source/GB_transplant.c rename to GraphBLAS/Source/transplant/GB_transplant.c diff --git a/GraphBLAS/Source/GB_transplant.h b/GraphBLAS/Source/transplant/GB_transplant.h similarity index 100% rename from GraphBLAS/Source/GB_transplant.h rename to GraphBLAS/Source/transplant/GB_transplant.h diff --git a/GraphBLAS/Source/GB_transplant_conform.c b/GraphBLAS/Source/transplant/GB_transplant_conform.c similarity index 100% rename from GraphBLAS/Source/GB_transplant_conform.c rename to GraphBLAS/Source/transplant/GB_transplant_conform.c diff --git a/GraphBLAS/Source/GB_transpose.c b/GraphBLAS/Source/transpose/GB_transpose.c similarity index 99% rename from GraphBLAS/Source/GB_transpose.c rename to GraphBLAS/Source/transpose/GB_transpose.c index d7a4a41f6c..1829d0779a 100644 --- a/GraphBLAS/Source/GB_transpose.c +++ b/GraphBLAS/Source/transpose/GB_transpose.c @@ -52,9 +52,10 @@ GB_phybix_free (C) ; \ } -#include "GB_transpose.h" -#include "GB_build.h" -#include "GB_apply.h" +#include "transpose/GB_transpose.h" +#include "builder/GB_build.h" +#include "apply/GB_apply.h" +#include "extractTuples/GB_extractTuples.h" //------------------------------------------------------------------------------ // GB_transpose diff --git a/GraphBLAS/Source/GB_transpose.h b/GraphBLAS/Source/transpose/GB_transpose.h similarity index 100% rename from GraphBLAS/Source/GB_transpose.h rename to GraphBLAS/Source/transpose/GB_transpose.h diff --git a/GraphBLAS/Source/GB_transpose_bucket.c b/GraphBLAS/Source/transpose/GB_transpose_bucket.c similarity index 99% rename from GraphBLAS/Source/GB_transpose_bucket.c rename to GraphBLAS/Source/transpose/GB_transpose_bucket.c index b3bafc99c4..f6344bb858 100644 --- a/GraphBLAS/Source/GB_transpose_bucket.c +++ b/GraphBLAS/Source/transpose/GB_transpose_bucket.c @@ -35,7 +35,7 @@ // This method is parallel, but not highly scalable. At most O(e/m) threads // are used. -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" #define GB_FREE_WORKSPACE \ { \ @@ -171,7 +171,7 @@ GrB_Info GB_transpose_bucket // bucket transpose; typecast and apply op GB_FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (A_slice, A->p, A->nvec, nthreads, true) ; + GB_p_slice (A_slice, A->p, A->nvec, nthreads, true) ; // sum up the row counts and find C->p if (nthreads == 1) diff --git a/GraphBLAS/Source/GB_transpose_cast.c b/GraphBLAS/Source/transpose/GB_transpose_cast.c similarity index 95% rename from GraphBLAS/Source/GB_transpose_cast.c rename to GraphBLAS/Source/transpose/GB_transpose_cast.c index 483ff2c423..086672e4ec 100644 --- a/GraphBLAS/Source/GB_transpose_cast.c +++ b/GraphBLAS/Source/transpose/GB_transpose_cast.c @@ -12,8 +12,8 @@ // ctype is not equal to A->type. If iso_one is true, C is returned as an // iso matrix, with an iso value of 1. -#include "GB_transpose.h" -#include "GB_unop.h" +#include "transpose/GB_transpose.h" +#include "unaryop/GB_unop.h" GrB_Info GB_transpose_cast // C= (ctype) A' or one (A'), not in-place ( diff --git a/GraphBLAS/Source/GB_transpose_in_place.c b/GraphBLAS/Source/transpose/GB_transpose_in_place.c similarity index 96% rename from GraphBLAS/Source/GB_transpose_in_place.c rename to GraphBLAS/Source/transpose/GB_transpose_in_place.c index 020d8e9ef2..7dddc67671 100644 --- a/GraphBLAS/Source/GB_transpose_in_place.c +++ b/GraphBLAS/Source/transpose/GB_transpose_in_place.c @@ -10,7 +10,7 @@ // All other uses of GB_transpose are not in-place. // No operator is applied and no typecasting is done. -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" GrB_Info GB_transpose_in_place // C=A', no change of type, no operators ( diff --git a/GraphBLAS/Source/GB_transpose_ix.c b/GraphBLAS/Source/transpose/GB_transpose_ix.c similarity index 91% rename from GraphBLAS/Source/GB_transpose_ix.c rename to GraphBLAS/Source/transpose/GB_transpose_ix.c index 0e2e7ad857..0c2005eacc 100644 --- a/GraphBLAS/Source/GB_transpose_ix.c +++ b/GraphBLAS/Source/transpose/GB_transpose_ix.c @@ -27,11 +27,11 @@ // Workspaces and A_slice are NULL. // This method is parallel and fully scalable. -#include "GB_transpose.h" -#include "GB_unop.h" -#include "GB_stringify.h" +#include "transpose/GB_transpose.h" +#include "unaryop/GB_unop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_unop__include.h" +#include "FactoryKernels/GB_uop__include.h" #endif GrB_Info GB_transpose_ix // transpose the pattern and values of a matrix @@ -77,7 +77,7 @@ GrB_Info GB_transpose_ix // transpose the pattern and values of a matrix // C = pattern of A transposed #define GB_ISO_TRANSPOSE - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" info = GrB_SUCCESS ; } @@ -96,12 +96,12 @@ GrB_Info GB_transpose_ix // transpose the pattern and values of a matrix // define the worker for the switch factory //------------------------------------------------------------------ - #define GB_unop_tran(zname,aname) \ - GB (_unop_tran__identity ## zname ## aname) + #define GB_uop_tran(zname,aname) \ + GB (_uop_tran__identity ## zname ## aname) #define GB_WORKER(ignore1,zname,ztype,aname,atype) \ { \ - info = GB_unop_tran (zname,aname) \ + info = GB_uop_tran (zname,aname) \ (C, A, Workspaces, A_slice, nworkspaces, nthreads) ; \ } \ break ; @@ -110,7 +110,7 @@ GrB_Info GB_transpose_ix // transpose the pattern and values of a matrix // launch the switch factory //------------------------------------------------------------------ - #include "GB_twotype_factory.c" + #include "apply/factory/GB_twotype_factory.c" } #endif @@ -143,7 +143,7 @@ GrB_Info GB_transpose_ix // transpose the pattern and values of a matrix cast_A_to_X (Cx +((pC)*csize), Ax +((pA)*asize), asize) ; #define GB_A_TYPE GB_void #define GB_C_TYPE GB_void - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" info = GrB_SUCCESS ; } } diff --git a/GraphBLAS/Source/GB_transpose_method.c b/GraphBLAS/Source/transpose/GB_transpose_method.c similarity index 99% rename from GraphBLAS/Source/GB_transpose_method.c rename to GraphBLAS/Source/transpose/GB_transpose_method.c index 9e5fc03cbf..8db9cdaad0 100644 --- a/GraphBLAS/Source/GB_transpose_method.c +++ b/GraphBLAS/Source/transpose/GB_transpose_method.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_transpose.h" +#include "transpose/GB_transpose.h" // GB_transpose can use choose between a merge-sort-based method that takes // O(anz*log(anz)) time, or a bucket-sort method that takes O(anz+m+n) time. diff --git a/GraphBLAS/Source/GB_transpose_op.c b/GraphBLAS/Source/transpose/GB_transpose_op.c similarity index 94% rename from GraphBLAS/Source/GB_transpose_op.c rename to GraphBLAS/Source/transpose/GB_transpose_op.c index 085685c485..03625b9b0e 100644 --- a/GraphBLAS/Source/GB_transpose_op.c +++ b/GraphBLAS/Source/transpose/GB_transpose_op.c @@ -35,12 +35,12 @@ // Workspaces and A_slice are NULL. // This method is parallel and fully scalable. -#include "GB_transpose.h" -#include "GB_binop.h" -#include "GB_stringify.h" +#include "transpose/GB_transpose.h" +#include "binaryop/GB_binop.h" +#include "jitifyer/GB_stringify.h" #ifndef GBCOMPACT -#include "GB_unop__include.h" -#include "GB_ew__include.h" +#include "FactoryKernels/GB_uop__include.h" +#include "FactoryKernels/GB_ew__include.h" #endif GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix @@ -97,7 +97,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix // C = transpose the pattern #define GB_ISO_TRANSPOSE - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" info = GrB_SUCCESS ; } @@ -128,12 +128,12 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix // define the worker for the switch factory //-------------------------------------------------------------- - #define GB_unop_tran(opname,zname,aname) \ - GB (_unop_tran_ ## opname ## zname ## aname) + #define GB_uop_tran(opname,zname,aname) \ + GB (_uop_tran_ ## opname ## zname ## aname) #define GB_WORKER(opname,zname,ztype,aname,atype) \ { \ - info = GB_unop_tran (opname,zname,aname) \ + info = GB_uop_tran (opname,zname,aname) \ (C, A, Workspaces, A_slice, nworkspaces, nthreads) ; \ } \ break ; @@ -142,7 +142,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix // launch the switch factory //-------------------------------------------------------------- - #include "GB_unop_factory.c" + #include "apply/factory/GB_unop_factory.c" } } #endif @@ -191,7 +191,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix #define GB_A_TYPE GB_void #define GB_C_TYPE GB_void - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" info = GrB_SUCCESS ; } @@ -284,7 +284,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix #define GB_NO_FIRST #define GB_NO_SECOND #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif @@ -335,7 +335,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix #define GB_NO_FIRST #define GB_NO_SECOND #define GB_NO_PAIR - #include "GB_binop_factory.c" + #include "binaryop/factory/GB_binop_factory.c" } } #endif @@ -372,7 +372,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix /* Cx [pC] = fop (xwork) ; Cx is of type op->ztype */ \ fop (Cx +((pC)*zsize), scalarx, ywork) ; \ } - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" } else { @@ -386,7 +386,7 @@ GrB_Info GB_transpose_op // transpose, typecast, and apply operator to a matrix /* Cx [pC] = fop (xwork) ; Cx is of type op->ztype */ \ fop (Cx +(pC*zsize), xwork, scalarx) ; \ } - #include "GB_transpose_template.c" + #include "transpose/template/GB_transpose_template.c" } info = GrB_SUCCESS ; } diff --git a/GraphBLAS/Source/GrB_transpose.c b/GraphBLAS/Source/transpose/GrB_transpose.c similarity index 98% rename from GraphBLAS/Source/GrB_transpose.c rename to GraphBLAS/Source/transpose/GrB_transpose.c index c816aa1732..aa7c0aaac8 100644 --- a/GraphBLAS/Source/GrB_transpose.c +++ b/GraphBLAS/Source/transpose/GrB_transpose.c @@ -11,9 +11,9 @@ #define GB_FREE_ALL GB_Matrix_free (&T) ; -#include "GB_transpose.h" -#include "GB_accum_mask.h" -#include "GB_get_mask.h" +#include "transpose/GB_transpose.h" +#include "mask/GB_accum_mask.h" +#include "mask/GB_get_mask.h" GrB_Info GrB_transpose // C = accum(C,A') or accum(C,A) ( diff --git a/GraphBLAS/Source/Template/GB_transpose_bitmap.c b/GraphBLAS/Source/transpose/template/GB_transpose_bitmap.c similarity index 100% rename from GraphBLAS/Source/Template/GB_transpose_bitmap.c rename to GraphBLAS/Source/transpose/template/GB_transpose_bitmap.c diff --git a/GraphBLAS/Source/Template/GB_transpose_full.c b/GraphBLAS/Source/transpose/template/GB_transpose_full.c similarity index 100% rename from GraphBLAS/Source/Template/GB_transpose_full.c rename to GraphBLAS/Source/transpose/template/GB_transpose_full.c diff --git a/GraphBLAS/Source/Template/GB_transpose_sparse.c b/GraphBLAS/Source/transpose/template/GB_transpose_sparse.c similarity index 100% rename from GraphBLAS/Source/Template/GB_transpose_sparse.c rename to GraphBLAS/Source/transpose/template/GB_transpose_sparse.c diff --git a/GraphBLAS/Source/Template/GB_transpose_template.c b/GraphBLAS/Source/transpose/template/GB_transpose_template.c similarity index 86% rename from GraphBLAS/Source/Template/GB_transpose_template.c rename to GraphBLAS/Source/transpose/template/GB_transpose_template.c index c03aa5c7e8..7fd76a1a6d 100644 --- a/GraphBLAS/Source/Template/GB_transpose_template.c +++ b/GraphBLAS/Source/transpose/template/GB_transpose_template.c @@ -10,7 +10,7 @@ { // Ax unused for some uses of this template - #include "GB_unused.h" + #include "include/GB_unused.h" //-------------------------------------------------------------------------- // get A and C @@ -46,17 +46,17 @@ #if GB_C_IS_FULL { // A and C are both full - #include "GB_transpose_full.c" + #include "template/GB_transpose_full.c" } #elif GB_C_IS_BITMAP { // A and C are both bitmap - #include "GB_transpose_bitmap.c" + #include "template/GB_transpose_bitmap.c" } #else { // A is sparse or hypersparse; C is sparse - #include "GB_transpose_sparse.c" + #include "template/GB_transpose_sparse.c" } #endif } @@ -68,18 +68,18 @@ if (A->b == NULL) { // A and C are both full - #include "GB_transpose_full.c" + #include "template/GB_transpose_full.c" } else { // A and C are both bitmap - #include "GB_transpose_bitmap.c" + #include "template/GB_transpose_bitmap.c" } } else { // A is sparse or hypersparse; C is sparse - #include "GB_transpose_sparse.c" + #include "template/GB_transpose_sparse.c" } } #endif diff --git a/GraphBLAS/Source/GB_code_size.c b/GraphBLAS/Source/type/GB_code_size.c similarity index 100% rename from GraphBLAS/Source/GB_code_size.c rename to GraphBLAS/Source/type/GB_code_size.c diff --git a/GraphBLAS/Source/GB_code_string.c b/GraphBLAS/Source/type/GB_code_string.c similarity index 100% rename from GraphBLAS/Source/GB_code_string.c rename to GraphBLAS/Source/type/GB_code_string.c diff --git a/GraphBLAS/Source/GB_code_type.c b/GraphBLAS/Source/type/GB_code_type.c similarity index 100% rename from GraphBLAS/Source/GB_code_type.c rename to GraphBLAS/Source/type/GB_code_type.c diff --git a/GraphBLAS/Source/GB_matvec_type.c b/GraphBLAS/Source/type/GB_matvec_type.c similarity index 100% rename from GraphBLAS/Source/GB_matvec_type.c rename to GraphBLAS/Source/type/GB_matvec_type.c diff --git a/GraphBLAS/Source/GB_matvec_type_name.c b/GraphBLAS/Source/type/GB_matvec_type_name.c similarity index 100% rename from GraphBLAS/Source/GB_matvec_type_name.c rename to GraphBLAS/Source/type/GB_matvec_type_name.c diff --git a/GraphBLAS/Source/GB_type.h b/GraphBLAS/Source/type/GB_type.h similarity index 100% rename from GraphBLAS/Source/GB_type.h rename to GraphBLAS/Source/type/GB_type.h diff --git a/GraphBLAS/Source/GrB_Type_free.c b/GraphBLAS/Source/type/GrB_Type_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Type_free.c rename to GraphBLAS/Source/type/GrB_Type_free.c diff --git a/GraphBLAS/Source/GrB_Type_new.c b/GraphBLAS/Source/type/GrB_Type_new.c similarity index 100% rename from GraphBLAS/Source/GrB_Type_new.c rename to GraphBLAS/Source/type/GrB_Type_new.c diff --git a/GraphBLAS/Source/GxB_Matrix_type.c b/GraphBLAS/Source/type/GxB_Matrix_type.c similarity index 100% rename from GraphBLAS/Source/GxB_Matrix_type.c rename to GraphBLAS/Source/type/GxB_Matrix_type.c diff --git a/GraphBLAS/Source/GxB_Matrix_type_name.c b/GraphBLAS/Source/type/GxB_Matrix_type_name.c similarity index 100% rename from GraphBLAS/Source/GxB_Matrix_type_name.c rename to GraphBLAS/Source/type/GxB_Matrix_type_name.c diff --git a/GraphBLAS/Source/GxB_Scalar_type.c b/GraphBLAS/Source/type/GxB_Scalar_type.c similarity index 100% rename from GraphBLAS/Source/GxB_Scalar_type.c rename to GraphBLAS/Source/type/GxB_Scalar_type.c diff --git a/GraphBLAS/Source/GxB_Scalar_type_name.c b/GraphBLAS/Source/type/GxB_Scalar_type_name.c similarity index 100% rename from GraphBLAS/Source/GxB_Scalar_type_name.c rename to GraphBLAS/Source/type/GxB_Scalar_type_name.c diff --git a/GraphBLAS/Source/GxB_Type_from_name.c b/GraphBLAS/Source/type/GxB_Type_from_name.c similarity index 100% rename from GraphBLAS/Source/GxB_Type_from_name.c rename to GraphBLAS/Source/type/GxB_Type_from_name.c diff --git a/GraphBLAS/Source/GxB_Type_name.c b/GraphBLAS/Source/type/GxB_Type_name.c similarity index 100% rename from GraphBLAS/Source/GxB_Type_name.c rename to GraphBLAS/Source/type/GxB_Type_name.c diff --git a/GraphBLAS/Source/GxB_Type_new.c b/GraphBLAS/Source/type/GxB_Type_new.c similarity index 99% rename from GraphBLAS/Source/GxB_Type_new.c rename to GraphBLAS/Source/type/GxB_Type_new.c index eeff523ad2..b4bfe342cf 100644 --- a/GraphBLAS/Source/GxB_Type_new.c +++ b/GraphBLAS/Source/type/GxB_Type_new.c @@ -34,7 +34,7 @@ // provided, then an error is returned (GrB_INVALID_VALUE). #include "GB.h" -#include "GB_stringify.h" +#include "jitifyer/GB_stringify.h" GrB_Info GxB_Type_new ( diff --git a/GraphBLAS/Source/GxB_Type_size.c b/GraphBLAS/Source/type/GxB_Type_size.c similarity index 100% rename from GraphBLAS/Source/GxB_Type_size.c rename to GraphBLAS/Source/type/GxB_Type_size.c diff --git a/GraphBLAS/Source/GxB_Vector_type.c b/GraphBLAS/Source/type/GxB_Vector_type.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_type.c rename to GraphBLAS/Source/type/GxB_Vector_type.c diff --git a/GraphBLAS/Source/GxB_Vector_type_name.c b/GraphBLAS/Source/type/GxB_Vector_type_name.c similarity index 100% rename from GraphBLAS/Source/GxB_Vector_type_name.c rename to GraphBLAS/Source/type/GxB_Vector_type_name.c diff --git a/GraphBLAS/Source/Template/GB_bytes.h b/GraphBLAS/Source/type/include/GB_bytes.h similarity index 100% rename from GraphBLAS/Source/Template/GB_bytes.h rename to GraphBLAS/Source/type/include/GB_bytes.h diff --git a/GraphBLAS/Source/Shared/GB_pun.h b/GraphBLAS/Source/type/include/GB_pun.h similarity index 98% rename from GraphBLAS/Source/Shared/GB_pun.h rename to GraphBLAS/Source/type/include/GB_pun.h index 31d2f59ae8..30c1d0e34c 100644 --- a/GraphBLAS/Source/Shared/GB_pun.h +++ b/GraphBLAS/Source/type/include/GB_pun.h @@ -15,8 +15,6 @@ #ifndef GB_PUN_H #define GB_PUN_H -#undef GB_PUN #define GB_PUN(type,value) (*((type *) (&(value)))) #endif - diff --git a/GraphBLAS/Source/GB_unop.h b/GraphBLAS/Source/unaryop/GB_unop.h similarity index 100% rename from GraphBLAS/Source/GB_unop.h rename to GraphBLAS/Source/unaryop/GB_unop.h diff --git a/GraphBLAS/Source/GB_unop_identity.c b/GraphBLAS/Source/unaryop/GB_unop_identity.c similarity index 97% rename from GraphBLAS/Source/GB_unop_identity.c rename to GraphBLAS/Source/unaryop/GB_unop_identity.c index a3c847c1de..525fc24831 100644 --- a/GraphBLAS/Source/GB_unop_identity.c +++ b/GraphBLAS/Source/unaryop/GB_unop_identity.c @@ -8,8 +8,8 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_unop.h" -#include "GB_unused.h" +#include "unaryop/GB_unop.h" +#include "include/GB_unused.h" GB_Operator GB_unop_identity // return IDENTITY operator, or NULL on error ( diff --git a/GraphBLAS/Source/GB_unop_new.c b/GraphBLAS/Source/unaryop/GB_unop_new.c similarity index 98% rename from GraphBLAS/Source/GB_unop_new.c rename to GraphBLAS/Source/unaryop/GB_unop_new.c index d4486fc9c5..596802f594 100644 --- a/GraphBLAS/Source/GB_unop_new.c +++ b/GraphBLAS/Source/unaryop/GB_unop_new.c @@ -14,7 +14,7 @@ // The unary op header is allocated by the caller, and passed in uninitialized. #include "GB.h" -#include "GB_unop.h" +#include "unaryop/GB_unop.h" GrB_Info GB_unop_new ( diff --git a/GraphBLAS/Source/GB_unop_one.c b/GraphBLAS/Source/unaryop/GB_unop_one.c similarity index 97% rename from GraphBLAS/Source/GB_unop_one.c rename to GraphBLAS/Source/unaryop/GB_unop_one.c index 9e307a6ab8..8c903c56f5 100644 --- a/GraphBLAS/Source/GB_unop_one.c +++ b/GraphBLAS/Source/unaryop/GB_unop_one.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB.h" -#include "GB_unop.h" +#include "unaryop/GB_unop.h" GrB_UnaryOp GB_unop_one (GB_Type_code xcode) { diff --git a/GraphBLAS/Source/GrB_UnaryOp_free.c b/GraphBLAS/Source/unaryop/GrB_UnaryOp_free.c similarity index 100% rename from GraphBLAS/Source/GrB_UnaryOp_free.c rename to GraphBLAS/Source/unaryop/GrB_UnaryOp_free.c diff --git a/GraphBLAS/Source/GrB_UnaryOp_new.c b/GraphBLAS/Source/unaryop/GrB_UnaryOp_new.c similarity index 100% rename from GraphBLAS/Source/GrB_UnaryOp_new.c rename to GraphBLAS/Source/unaryop/GrB_UnaryOp_new.c diff --git a/GraphBLAS/Source/GxB_UnaryOp_new.c b/GraphBLAS/Source/unaryop/GxB_UnaryOp_new.c similarity index 98% rename from GraphBLAS/Source/GxB_UnaryOp_new.c rename to GraphBLAS/Source/unaryop/GxB_UnaryOp_new.c index 8d49696c50..0a0a71d533 100644 --- a/GraphBLAS/Source/GxB_UnaryOp_new.c +++ b/GraphBLAS/Source/unaryop/GxB_UnaryOp_new.c @@ -12,8 +12,8 @@ // output arguments internally as needed. #include "GB.h" -#include "GB_unop.h" -#include "GB_stringify.h" +#include "unaryop/GB_unop.h" +#include "jitifyer/GB_stringify.h" GrB_Info GxB_UnaryOp_new // create a new user-defined unary operator ( diff --git a/GraphBLAS/Source/GxB_UnaryOp_xtype.c b/GraphBLAS/Source/unaryop/GxB_UnaryOp_xtype.c similarity index 100% rename from GraphBLAS/Source/GxB_UnaryOp_xtype.c rename to GraphBLAS/Source/unaryop/GxB_UnaryOp_xtype.c diff --git a/GraphBLAS/Source/GxB_UnaryOp_xtype_name.c b/GraphBLAS/Source/unaryop/GxB_UnaryOp_xtype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_UnaryOp_xtype_name.c rename to GraphBLAS/Source/unaryop/GxB_UnaryOp_xtype_name.c diff --git a/GraphBLAS/Source/GxB_UnaryOp_ztype.c b/GraphBLAS/Source/unaryop/GxB_UnaryOp_ztype.c similarity index 100% rename from GraphBLAS/Source/GxB_UnaryOp_ztype.c rename to GraphBLAS/Source/unaryop/GxB_UnaryOp_ztype.c diff --git a/GraphBLAS/Source/GxB_UnaryOp_ztype_name.c b/GraphBLAS/Source/unaryop/GxB_UnaryOp_ztype_name.c similarity index 100% rename from GraphBLAS/Source/GxB_UnaryOp_ztype_name.c rename to GraphBLAS/Source/unaryop/GxB_UnaryOp_ztype_name.c diff --git a/GraphBLAS/Source/GrB_Vector_free.c b/GraphBLAS/Source/vector/GrB_Vector_free.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_free.c rename to GraphBLAS/Source/vector/GrB_Vector_free.c diff --git a/GraphBLAS/Source/GrB_Vector_new.c b/GraphBLAS/Source/vector/GrB_Vector_new.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_new.c rename to GraphBLAS/Source/vector/GrB_Vector_new.c diff --git a/GraphBLAS/Source/GrB_Vector_size.c b/GraphBLAS/Source/vector/GrB_Vector_size.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_size.c rename to GraphBLAS/Source/vector/GrB_Vector_size.c diff --git a/GraphBLAS/Source/GB_block.c b/GraphBLAS/Source/wait/GB_block.c similarity index 98% rename from GraphBLAS/Source/GB_block.c rename to GraphBLAS/Source/wait/GB_block.c index 53e38c4cb3..0169b18b81 100644 --- a/GraphBLAS/Source/GB_block.c +++ b/GraphBLAS/Source/wait/GB_block.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_Pending.h" +#include "pending/GB_Pending.h" #define GB_FREE_ALL ; diff --git a/GraphBLAS/Source/GB_jappend.h b/GraphBLAS/Source/wait/GB_jappend.h similarity index 100% rename from GraphBLAS/Source/GB_jappend.h rename to GraphBLAS/Source/wait/GB_jappend.h diff --git a/GraphBLAS/Source/GB_unjumble.c b/GraphBLAS/Source/wait/GB_unjumble.c similarity index 90% rename from GraphBLAS/Source/GB_unjumble.c rename to GraphBLAS/Source/wait/GB_unjumble.c index 13b8bd519e..0eb471ddc8 100644 --- a/GraphBLAS/Source/GB_unjumble.c +++ b/GraphBLAS/Source/wait/GB_unjumble.c @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ -#include "GB_sort.h" +#include "sort/GB_sort.h" GrB_Info GB_unjumble // unjumble a matrix ( @@ -72,7 +72,7 @@ GrB_Info GB_unjumble // unjumble a matrix // out of memory return (GrB_OUT_OF_MEMORY) ; } - GB_pslice (A_slice, Ap, anvec, ntasks, false) ; + GB_p_slice (A_slice, Ap, anvec, ntasks, false) ; //-------------------------------------------------------------------------- // sort the vectors @@ -83,7 +83,7 @@ GrB_Info GB_unjumble // unjumble a matrix case 0 : // iso matrices of any type; only sort the pattern #define GB_QSORT \ GB_qsort_1 (Ai+pA_start, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" break ; case GB_1BYTE : // bool, uint8, int8, and user defined types of size 1 @@ -91,7 +91,7 @@ GrB_Info GB_unjumble // unjumble a matrix uint8_t *Ax = (uint8_t *) A->x ; #define GB_QSORT \ GB_qsort_1b_size1 (Ai+pA_start, Ax+pA_start, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" } break ; @@ -100,7 +100,7 @@ GrB_Info GB_unjumble // unjumble a matrix uint16_t *Ax = (uint16_t *) A->x ; #define GB_QSORT \ GB_qsort_1b_size2 (Ai+pA_start, Ax+pA_start, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" } break ; @@ -109,7 +109,7 @@ GrB_Info GB_unjumble // unjumble a matrix uint32_t *Ax = (uint32_t *) A->x ; #define GB_QSORT \ GB_qsort_1b_size4 (Ai+pA_start, Ax+pA_start, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" } break ; @@ -118,7 +118,7 @@ GrB_Info GB_unjumble // unjumble a matrix uint64_t *Ax = (uint64_t *) A->x ; #define GB_QSORT \ GB_qsort_1b_size8 (Ai+pA_start, Ax+pA_start, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" } break ; @@ -127,7 +127,7 @@ GrB_Info GB_unjumble // unjumble a matrix GB_blob16 *Ax = (GB_blob16 *) A->x ; #define GB_QSORT \ GB_qsort_1b_size16 (Ai+pA_start, Ax+pA_start, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" } break ; @@ -136,7 +136,7 @@ GrB_Info GB_unjumble // unjumble a matrix GB_void *Ax = (GB_void *) A->x ; #define GB_QSORT \ GB_qsort_1b (Ai+pA_start, Ax+pA_start*asize, asize, aknz) ; - #include "GB_unjumbled_template.c" + #include "wait/factory/GB_unjumbled_template.c" } break ; } diff --git a/GraphBLAS/Source/GB_wait.c b/GraphBLAS/Source/wait/GB_wait.c similarity index 99% rename from GraphBLAS/Source/GB_wait.c rename to GraphBLAS/Source/wait/GB_wait.c index 65e831b86b..9e5e36a8f6 100644 --- a/GraphBLAS/Source/GB_wait.c +++ b/GraphBLAS/Source/wait/GB_wait.c @@ -51,13 +51,13 @@ GB_phybix_free (A) ; \ } -#include "GB_select.h" -#include "GB_add.h" -#include "GB_binop.h" -#include "GB_Pending.h" -#include "GB_build.h" -#include "GB_jappend.h" -#include "GB_scalar_wrap.h" +#include "select/GB_select.h" +#include "ewise/GB_add.h" +#include "binaryop/GB_binop.h" +#include "pending/GB_Pending.h" +#include "builder/GB_build.h" +#include "wait/GB_jappend.h" +#include "scalar/GB_Scalar_wrap.h" GrB_Info GB_wait // finish all pending computations ( diff --git a/GraphBLAS/Source/GB_wait.h b/GraphBLAS/Source/wait/GB_wait.h similarity index 100% rename from GraphBLAS/Source/GB_wait.h rename to GraphBLAS/Source/wait/GB_wait.h diff --git a/GraphBLAS/Source/GrB_BinaryOp_wait.c b/GraphBLAS/Source/wait/GrB_BinaryOp_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_BinaryOp_wait.c rename to GraphBLAS/Source/wait/GrB_BinaryOp_wait.c diff --git a/GraphBLAS/Source/GrB_Descriptor_wait.c b/GraphBLAS/Source/wait/GrB_Descriptor_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Descriptor_wait.c rename to GraphBLAS/Source/wait/GrB_Descriptor_wait.c diff --git a/GraphBLAS/Source/GrB_IndexUnaryOp_wait.c b/GraphBLAS/Source/wait/GrB_IndexUnaryOp_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_IndexUnaryOp_wait.c rename to GraphBLAS/Source/wait/GrB_IndexUnaryOp_wait.c diff --git a/GraphBLAS/Source/GrB_Matrix_wait.c b/GraphBLAS/Source/wait/GrB_Matrix_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Matrix_wait.c rename to GraphBLAS/Source/wait/GrB_Matrix_wait.c diff --git a/GraphBLAS/Source/GrB_Monoid_wait.c b/GraphBLAS/Source/wait/GrB_Monoid_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Monoid_wait.c rename to GraphBLAS/Source/wait/GrB_Monoid_wait.c diff --git a/GraphBLAS/Source/GrB_Scalar_wait.c b/GraphBLAS/Source/wait/GrB_Scalar_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Scalar_wait.c rename to GraphBLAS/Source/wait/GrB_Scalar_wait.c diff --git a/GraphBLAS/Source/GrB_Semiring_wait.c b/GraphBLAS/Source/wait/GrB_Semiring_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Semiring_wait.c rename to GraphBLAS/Source/wait/GrB_Semiring_wait.c diff --git a/GraphBLAS/Source/GrB_Type_wait.c b/GraphBLAS/Source/wait/GrB_Type_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Type_wait.c rename to GraphBLAS/Source/wait/GrB_Type_wait.c diff --git a/GraphBLAS/Source/GrB_UnaryOp_wait.c b/GraphBLAS/Source/wait/GrB_UnaryOp_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_UnaryOp_wait.c rename to GraphBLAS/Source/wait/GrB_UnaryOp_wait.c diff --git a/GraphBLAS/Source/GrB_Vector_wait.c b/GraphBLAS/Source/wait/GrB_Vector_wait.c similarity index 100% rename from GraphBLAS/Source/GrB_Vector_wait.c rename to GraphBLAS/Source/wait/GrB_Vector_wait.c diff --git a/GraphBLAS/Source/GxB_Context_wait.c b/GraphBLAS/Source/wait/GxB_Context_wait.c similarity index 100% rename from GraphBLAS/Source/GxB_Context_wait.c rename to GraphBLAS/Source/wait/GxB_Context_wait.c diff --git a/GraphBLAS/Source/Factories/GB_unjumbled_template.c b/GraphBLAS/Source/wait/factory/GB_unjumbled_template.c similarity index 100% rename from GraphBLAS/Source/Factories/GB_unjumbled_template.c rename to GraphBLAS/Source/wait/factory/GB_unjumbled_template.c diff --git a/GraphBLAS/Source/Template/GB_wait_macros.h b/GraphBLAS/Source/wait/include/GB_wait_macros.h similarity index 100% rename from GraphBLAS/Source/Template/GB_wait_macros.h rename to GraphBLAS/Source/wait/include/GB_wait_macros.h diff --git a/GraphBLAS/Source/GB_status_code.c b/GraphBLAS/Source/werk/GB_status_code.c similarity index 100% rename from GraphBLAS/Source/GB_status_code.c rename to GraphBLAS/Source/werk/GB_status_code.c diff --git a/GraphBLAS/Source/GB_werk_pop.c b/GraphBLAS/Source/werk/GB_werk_pop.c similarity index 100% rename from GraphBLAS/Source/GB_werk_pop.c rename to GraphBLAS/Source/werk/GB_werk_pop.c diff --git a/GraphBLAS/Source/GB_werk_push.c b/GraphBLAS/Source/werk/GB_werk_push.c similarity index 100% rename from GraphBLAS/Source/GB_werk_push.c rename to GraphBLAS/Source/werk/GB_werk_push.c diff --git a/GraphBLAS/Source/GB_where.h b/GraphBLAS/Source/werk/GB_where.h similarity index 100% rename from GraphBLAS/Source/GB_where.h rename to GraphBLAS/Source/werk/GB_where.h diff --git a/GraphBLAS/Source/Template/GB_werk.h b/GraphBLAS/Source/werk/include/GB_werk.h similarity index 100% rename from GraphBLAS/Source/Template/GB_werk.h rename to GraphBLAS/Source/werk/include/GB_werk.h diff --git a/GraphBLAS/Source/GB_zstd.c b/GraphBLAS/Source/zstd_wrapper/GB_zstd.c similarity index 97% rename from GraphBLAS/Source/GB_zstd.c rename to GraphBLAS/Source/zstd_wrapper/GB_zstd.c index 6722ea4fff..50a3d56b7b 100644 --- a/GraphBLAS/Source/GB_zstd.c +++ b/GraphBLAS/Source/zstd_wrapper/GB_zstd.c @@ -13,8 +13,8 @@ // in place of malloc/calloc/free. #include "GB.h" -#include "GB_serialize.h" -#include "GB_zstd.h" +#include "serialize/GB_serialize.h" +#include "zstd_wrapper/GB_zstd.h" void *ZSTD_malloc (size_t s) { diff --git a/GraphBLAS/Source/GB_zstd.h b/GraphBLAS/Source/zstd_wrapper/GB_zstd.h similarity index 100% rename from GraphBLAS/Source/GB_zstd.h rename to GraphBLAS/Source/zstd_wrapper/GB_zstd.h diff --git a/GraphBLAS/Tcov/Makefile b/GraphBLAS/Tcov/Makefile index c32b000fb8..a80836c7e1 100644 --- a/GraphBLAS/Tcov/Makefile +++ b/GraphBLAS/Tcov/Makefile @@ -30,7 +30,7 @@ INC = tmp_include/* SRC2 = $(notdir $(wildcard $(SRC))) OBJ = $(SRC2:.c=.o) LIBS = -I = -Itmp_include -I../Test -I../rmm_wrap -I../zstd -I../zstd/zstd_subset -I../lz4 -I../xxHash -I../Source/JitKernels +I = -Itmp_include -I../Test -I../rmm_wrap -I../zstd -I../zstd/zstd_subset -I../lz4 -I../xxHash CPPFLAGS = $(I) -DGBNCPUFEAT -DGBCOVER $(MATLAB) SO_OPTS = $(LDFLAGS) diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2.c index a166d9ec22..e4dfe1eaea 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v8.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv2, double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator: +#define GB_X_TYPE double +#define GB_Y_TYPE float #ifndef GB_GUARD_my_rdiv2_DEFINED #define GB_GUARD_my_rdiv2_DEFINED GB_STATIC_INLINE @@ -113,17 +116,17 @@ void my_rdiv2 (double *z, const double *x, const float *y) #define GB_DECLAREB(b) float b #define GB_GETB(b,Bx,p,iso) b = Bx [p] -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2 #define GB_jit_query GB_jit__AxB_dot2__2c1f000bba0bbac7__plus_my_rdiv2_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { (*hash) = 0xa7db05133c25c170 ; - v [0] = 8 ; v [1] = 0 ; v [2] = 0 ; // intentionally stale version + v [0] = 9 ; v [1] = 2 ; v [2] = 9 ; // intentionally stale version defn [0] = NULL ; defn [1] = GB_my_rdiv2_USER_DEFN ; defn [2] = NULL ; diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2.c index 0ccddc9deb..096f8aed4f 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv2, double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator: +#define GB_X_TYPE double +#define GB_Y_TYPE float #ifndef GB_GUARD_my_rdiv2_DEFINED #define GB_GUARD_my_rdiv2_DEFINED GB_STATIC_INLINE @@ -113,12 +116,12 @@ void my_rdiv2 (double *z, const double *x, const float *y) #define GB_DECLAREB(b) float b #define GB_GETB(b,Bx,p,iso) b = Bx [p] -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2 #define GB_jit_query GB_jit__AxB_dot2__2c1f000bba0bbacf__plus_my_rdiv2_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { @@ -126,6 +129,7 @@ GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) v [0] = GxB_IMPLEMENTATION_MAJOR ; // keep at current version v [1] = GxB_IMPLEMENTATION_MINOR ; v [2] = GxB_IMPLEMENTATION_SUB ; + v [0] = 9 ; v [1] = 3 ; v [2] = 0 ; defn [0] = NULL ; defn [1] = GB_my_rdiv2_USER_DEFN ; defn [2] = NULL ; diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv.c index 7d30d88d5d..c00db893eb 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv, double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,16 +32,22 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator: +#define GB_X_TYPE double +#define GB_Y_TYPE double #ifndef GB_GUARD_my_rdiv_DEFINED #define GB_GUARD_my_rdiv_DEFINED GB_STATIC_INLINE void my_rdiv (double *z, const double *x, const double *y) { + // escape this quote: " + /* escape this backslash \ */ (*z) = (*y) / (*x) ; } #define GB_my_rdiv_USER_DEFN \ "void my_rdiv (double *z, const double *x, const double *y)\n" \ "{\n" \ +" // escape this quote: \"\n" \ +" /* escape this backslash \\ */\n" \ " (*z) = (*y) / (*x) ;\n" \ "}" #endif @@ -113,12 +120,12 @@ void my_rdiv (double *z, const double *x, const double *y) #define GB_DECLAREB(b) double b #define GB_GETB(b,Bx,p,iso) b = Bx [p] -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv #define GB_jit_query GB_jit__AxB_dot2__2c1f000bbb0bbbcd__plus_my_rdiv_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f046bbb0bbbcd.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f046bbb0bbbcd.c index 72155b27e9..f03547ff17 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f046bbb0bbbcd.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f046bbb0bbbcd.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f046bbb0bbbcd.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, rdiv, double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator: +#define GB_X_TYPE double +#define GB_Y_TYPE double #define GB_MULT(z,x,y,i,k,j) z = (y) / (x) // multiply-add operator: @@ -95,12 +98,12 @@ #define GB_DECLAREB(b) double b #define GB_GETB(b,Bx,p,iso) b = Bx [p] -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f046bbb0bbbcd #define GB_jit_query GB_jit__AxB_dot2__2c1f046bbb0bbbcd_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2.c index a93931aef2..becabba60b 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv2 (flipped), double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator (flipped): +#define GB_X_TYPE double +#define GB_Y_TYPE float #ifndef GB_GUARD_my_rdiv2_DEFINED #define GB_GUARD_my_rdiv2_DEFINED GB_STATIC_INLINE @@ -113,12 +116,12 @@ void my_rdiv2 (double *z, const double *x, const float *y) #define GB_DECLAREB(b) double b #define GB_GETB(b,Bx,p,iso) b = (double) (Bx [p]) -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2 #define GB_jit_query GB_jit__AxB_dot2__2c1f100bba0baacf__plus_my_rdiv2_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2.c index 19f7db91ca..6d42a27a85 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv2 (flipped), double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator (flipped): +#define GB_X_TYPE double +#define GB_Y_TYPE float #ifndef GB_GUARD_my_rdiv2_DEFINED #define GB_GUARD_my_rdiv2_DEFINED GB_STATIC_INLINE @@ -113,12 +116,12 @@ void my_rdiv2 (double *z, const double *x, const float *y) #define GB_DECLAREB(b) double b #define GB_GETB(b,Bx,p,iso) b = Bx [p] -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2 #define GB_jit_query GB_jit__AxB_dot2__2c1f100bba0babcd__plus_my_rdiv2_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2.c index 8295437c66..47348a9860 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv2 (flipped), double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator (flipped): +#define GB_X_TYPE double +#define GB_Y_TYPE float #ifndef GB_GUARD_my_rdiv2_DEFINED #define GB_GUARD_my_rdiv2_DEFINED GB_STATIC_INLINE @@ -113,12 +116,12 @@ void my_rdiv2 (double *z, const double *x, const float *y) #define GB_DECLAREB(b) double b #define GB_GETB(b,Bx,p,iso) b = Bx [p] -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2 #define GB_jit_query GB_jit__AxB_dot2__2c1f100bba0babcf__plus_my_rdiv2_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2.c b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2.c index 8dcbd183b3..dbb1898b2e 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" // semiring: (plus, my_rdiv2 (flipped), double) @@ -22,6 +22,7 @@ #define GB_IDENTITY_BYTE 0x00 #define GB_PRAGMA_SIMD_REDUCTION_MONOID(z) GB_PRAGMA_SIMD_REDUCTION (+,z) #define GB_Z_IGNORE_OVERFLOW 1 +#define GB_Z_SIZE 8 #define GB_Z_NBITS 64 #define GB_Z_ATOMIC_BITS 64 #define GB_Z_HAS_ATOMIC_UPDATE 1 @@ -31,6 +32,8 @@ #define GB_Z_CUDA_ATOMIC_TYPE double // multiplicative operator (flipped): +#define GB_X_TYPE double +#define GB_Y_TYPE float #ifndef GB_GUARD_my_rdiv2_DEFINED #define GB_GUARD_my_rdiv2_DEFINED GB_STATIC_INLINE @@ -113,12 +116,12 @@ void my_rdiv2 (double *z, const double *x, const float *y) #define GB_DECLAREB(b) double b #define GB_GETB(b,Bx,p,iso) b = (double) (Bx [p]) -#include "GB_mxm_shared_definitions.h" +#include "include/GB_mxm_shared_definitions.h" #ifndef GB_JIT_RUNTIME #define GB_jit_kernel GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2 #define GB_jit_query GB_jit__AxB_dot2__2c1f100bba0bbac7__plus_my_rdiv2_query #endif -#include "GB_jit_kernel_AxB_dot2.c" +#include "template/GB_jit_kernel_AxB_dot2.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_jit__user_op__0__my_rdiv.c b/GraphBLAS/Tcov/PreJIT/GB_jit__user_op__0__my_rdiv.c index ababd0a961..62358b2c49 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_jit__user_op__0__my_rdiv.c +++ b/GraphBLAS/Tcov/PreJIT/GB_jit__user_op__0__my_rdiv.c @@ -1,14 +1,14 @@ //------------------------------------------------------------------------------ // GB_jit__user_op__0__my_rdiv.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS v9.0.0, Timothy A. Davis, (c) 2017-2023, +// SuiteSparse:GraphBLAS v9.3.0, Timothy A. Davis, (c) 2017-2024, // All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // The above copyright and license do not apply to any // user-defined types and operators defined below. //------------------------------------------------------------------------------ -#include "GB_jit_kernel.h" +#include "include/GB_jit_kernel.h" #define GB_USER_OP_FUNCTION my_rdiv void my_rdiv (double *z, const double *x, const double *y) @@ -18,6 +18,7 @@ void my_rdiv (double *z, const double *x, const double *y) { // escape this quote: " /* escape this backslash \ */ + /* modified for GrB 9.3.0 */ (*z) = (*y) / (*x) ; } #define GB_my_rdiv_USER_DEFN \ @@ -25,6 +26,7 @@ void my_rdiv (double *z, const double *x, const double *y) "{\n" \ " // escape this quote: \"\n" \ " /* escape this backslash \\ */\n" \ +" /* modified for GrB 9.3.0 */\n" \ " (*z) = (*y) / (*x) ;\n" \ "}" #define GB_USER_OP_DEFN GB_my_rdiv_USER_DEFN @@ -32,7 +34,7 @@ void my_rdiv (double *z, const double *x, const double *y) #define GB_jit_kernel GB_jit__user_op__0__my_rdiv #define GB_jit_query GB_jit__user_op__0__my_rdiv_query #endif -#include "GB_jit_kernel_user_op.c" +#include "template/GB_jit_kernel_user_op.c" GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) ; GB_JIT_GLOBAL GB_JIT_QUERY_PROTO (GB_jit_query) { diff --git a/GraphBLAS/Tcov/PreJIT/GB_prejit.c b/GraphBLAS/Tcov/PreJIT/GB_prejit.c index 0341d74fa2..6fedc28188 100644 --- a/GraphBLAS/Tcov/PreJIT/GB_prejit.c +++ b/GraphBLAS/Tcov/PreJIT/GB_prejit.c @@ -2,7 +2,7 @@ // GraphBLAS/Config/GB_prejit.c: return list of PreJIT kernels //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -11,8 +11,8 @@ // indexed the following 9 kernels in GraphBLAS/PreJIT: #include "GB.h" -#include "GB_jit_kernel_proto.h" -#include "GB_jitifyer.h" +#include "jitifyer/GB_jitifyer.h" +#include "jit_kernels/include/GB_jit_kernel_proto.h" //------------------------------------------------------------------------------ // prototypes for all PreJIT kernels diff --git a/GraphBLAS/Tcov/PreJIT/README.txt b/GraphBLAS/Tcov/PreJIT/README.txt index b4011d4d45..16adf1fadb 100644 --- a/GraphBLAS/Tcov/PreJIT/README.txt +++ b/GraphBLAS/Tcov/PreJIT/README.txt @@ -23,7 +23,12 @@ This file will contain an index of the kernels listed above: GB_prejit.c -If GraphBLAS is modified, test145 should be run again to create these -JIT kernels, and then copy them here. Then modify GB_mex_rdiv.c to -trigger the stale PreJIT kernel case. +If GraphBLAS is modified, test145 should be run again to create these JIT +kernels, using the Test/test145.m script. Next, copy the above files into +GraphBLAS/Tcov/GB_prejit.c. Also copy them into GraphBLAS/PreJIT and rerun +'make' for the main GraphBLAS library, and then copy Config/GB_prejit.c here. + +Finally, modify GB_mex_rdiv.c to trigger the stale PreJIT kernel case, by +changing the string MY_RDIV. After modifying it, rerun test145 and copy the +final GB_jit__user_op__0__my_rdiv.c here. diff --git a/GraphBLAS/Tcov/grbcover.m b/GraphBLAS/Tcov/grbcover.m index c55bfefe9e..04c5019623 100644 --- a/GraphBLAS/Tcov/grbcover.m +++ b/GraphBLAS/Tcov/grbcover.m @@ -42,7 +42,9 @@ function grbcover (what) % list of include directories inc = '-Itmp_include -I../Test -I../Test/Template -I../lz4 -I../rmm_wrap' ; inc = [inc ' -I../zstd -I../zstd/zstd_subset -I. -I../xxHash'] ; -inc = [inc ' -I../Source/JitKernels '] ; +% inc = [inc ' -I../Source/jit_kernels '] ; +inc = [inc ' -I../Source/builtin '] ; +inc = [inc ' -I../Source '] ; have_octave = (exist ('OCTAVE_VERSION', 'builtin') == 5) ; if (have_octave) diff --git a/GraphBLAS/Tcov/grbcover_edit.m b/GraphBLAS/Tcov/grbcover_edit.m index 0f146b9cd8..621a89515d 100644 --- a/GraphBLAS/Tcov/grbcover_edit.m +++ b/GraphBLAS/Tcov/grbcover_edit.m @@ -67,6 +67,22 @@ % empty line: as-is fprintf (f_output, '\n') ; + elseif (contains (cline, '#include "')) + + if (contains (cline, '/GB_')) + % convert '#include "mxm/template/GB_AxB_whatever.h' + % to just '#include "GB_AxB_whatever.h' + quote = strfind (cline, '"') ; + quote = quote (1) ; + gb = strfind (cline, '/GB_') ; + gb = gb (1) ; + fprintf (f_output, '%s%s\n', ... + cline (1:quote), cline (gb+1:end)) ; + else + % no change to this line + fprintf (f_output, '%s\n', cline) ; + end + elseif (len > 1 && all (cline (1:len-2) == ' ') ... && (cline (len-1) == '{') && (cline (len) == ' ')) diff --git a/GraphBLAS/Tcov/grbmake.m b/GraphBLAS/Tcov/grbmake.m index f268f52b43..937687c8ce 100644 --- a/GraphBLAS/Tcov/grbmake.m +++ b/GraphBLAS/Tcov/grbmake.m @@ -19,27 +19,32 @@ copyfile ('GB_coverage.c', 'tmp_source/GB_coverage.c') ; % create the include files and place in tmp_include -hfiles = [ dir('../Include/*') ; ... - dir('../Source/*.h') ; ... - dir('../GraphBLAS/Config/*.h') ; ... - dir('../Source/Template') ; ... - dir('../Source/Factories') ; ... - dir('../Source/Shared') ; ... - dir('../JITpackage/*.h') ; ... - dir('../Source/FactoryKernels/*.h') ; ] ; +hfiles = [ ... + dir('../Include/GraphBLAS.h') ; ... + dir('../Source/*.h') ; ... + dir('../GraphBLAS/Config/*.h') ; ... + dir('../Source/include') ; ... + dir('../Source/*/*.h') ; ... + dir('../Source/*/include') ; ... + dir('../Source/*/template') ; ... + dir('../Source/*/factory') ; ... + dir('../JITpackage/*.h') ; ... + dir('../FactoryKernels/*.h') ; ] ; + count = grbcover_edit (hfiles, 0, 'tmp_include') ; fprintf ('hfile count: %d\n', count) ; % create the C files and place in tmp_source -cfiles = [ dir('../Source/*.c') ; ... - dir('../Source/FactoryKernels/*.c') ; ... - % use Tcov/PreJIT kernels ... - dir('PreJIT/*.c') ; ... - % not the PreJIT kernels in the primary source - % dir('../PreJIT/*.c') ; ... - % dir('../Config/GB_prejit.c') ; ... - dir('../JITpackage/*.c') - ] ; +cfiles = [ dir('../Source/*/*.c') ; ... + dir('../FactoryKernels/*.c') ; ... + % use Tcov/PreJIT kernels ... + dir('PreJIT/*.c') ; ... + % not the PreJIT kernels in the primary source: + % dir('../PreJIT/*.c') ; ... + % dir('../Config/GB_prejit.c') ; ... + dir('../JITpackage/*.c') + ] ; + count = grbcover_edit (cfiles, count, 'tmp_source') ; fprintf ('cfile count: %d\n', count) ; @@ -48,7 +53,7 @@ fprintf (fp, '%d\n', count) ; fclose (fp) ; -% revise this to match Source/Template/GB_coverage.h +% revise this to match Source/include/GB_coverage.h GBCOVER_MAX = 31000 ; assert (count < GBCOVER_MAX) ; diff --git a/GraphBLAS/Tcov/log_May22.txt b/GraphBLAS/Tcov/log_May22.txt deleted file mode 100644 index ebe423dda0..0000000000 --- a/GraphBLAS/Tcov/log_May22.txt +++ /dev/null @@ -1,205 +0,0 @@ - ----------------------------------------------- [malloc] [cover] -22-May 18:35:46 test169 8.9 sec 550: 24390 of 25105 2.8% 61.48/s -22-May 18:35:47 test250 1.6 sec 373: 24017 of 25105 4.3% 239.64/s -22-May 18:35:50 test250 2.4 sec 57: 23960 of 25105 4.6% 23.71/s -22-May 18:35:50 test279 0.1 sec 119: 23841 of 25105 5.0% 1570.29/s -22-May 18:35:50 test278 0.1 sec 48: 23793 of 25105 5.2% 658.19/s -22-May 18:35:50 test277 0.1 sec 38: 23755 of 25105 5.4% 599.77/s -22-May 18:35:50 test276 0.1 sec 1626: 22129 of 25105 11.9% 26337.96/s -22-May 18:35:50 test275 0.1 sec 117: 22012 of 25105 12.3% 1920.68/s -22-May 18:35:51 test274 0.1 sec 129: 21883 of 25105 12.8% 2258.48/s -22-May 18:35:51 test273 0.2 sec 114: 21769 of 25105 13.3% 695.05/s -22-May 18:35:51 test272 0.1 sec 11: 21758 of 25105 13.3% 186.21/s -22-May 18:35:51 test271 0.1 sec 497: 21261 of 25105 15.3% 8422.30/s -22-May 18:35:51 test270 0.1 sec 286: 20975 of 25105 16.5% 4941.09/s -22-May 18:35:51 test269 0.1 sec 83: 20892 of 25105 16.8% 1401.39/s -22-May 18:35:51 test268 0.1 sec 5: 20887 of 25105 16.8% 60.92/s -22-May 18:35:54 test145 2.4 sec 210: 20677 of 25105 17.6% 88.99/s -22-May 18:35:54 test145 0.0 sec 1: 20676 of 25105 17.6% 26.26/s -22-May 18:35:54 test145 0.0 sec 18: 20658 of 25105 17.7% 791.10/s -22-May 18:35:54 test145 0.0 sec 4: 20654 of 25105 17.7% 217.32/s -22-May 18:35:56 test145 1.7 sec 34: 20620 of 25105 17.9% 19.91/s -22-May 18:35:56 test145 0.0 sec 3: 20617 of 25105 17.9% 179.97/s -22-May 18:35:57 test240 1.1 sec 74: 20540 of 25105 18.2% 64.78/s -22-May 18:35:57 test240 0.3 sec 1: 20539 of 25105 18.2% 3.19/s -22-May 18:35:59 test237 1.0 sec 40: 20499 of 25105 18.3% 38.57/s -22-May 18:36:01 test237 2.8 sec 2: 20497 of 25105 18.4% 0.72/s -22-May 18:36:02 test237 0.0 sec 18: 20479 of 25105 18.4% 410.28/s -22-May 18:36:02 test237 0.0 sec 6: 20473 of 25105 18.5% 192.54/s -22-May 18:36:02 test237 0.0 sec 4: 20469 of 25105 18.5% 126.51/s -22-May 18:36:03 test267 0.8 sec 8: 20461 of 25105 18.5% 10.21/s -22-May 18:36:03 test267 0.0 sec 1: 20460 of 25105 18.5% 2079.00/s -22-May 18:36:03 test265 0.5 sec 36: 20424 of 25105 18.6% 66.23/s -22-May 18:36:03 test264 0.1 sec 173: 20251 of 25105 19.3% 2716.58/s -22-May 18:36:05 test263 0.9 sec 13: 20238 of 25105 19.4% 14.15/s -22-May 18:36:05 test262 0.1 sec 22: 20216 of 25105 19.5% 314.59/s -22-May 18:36:05 test261 0.1 sec 22: 20194 of 25105 19.6% 377.94/s -22-May 18:36:05 test260 0.1 sec 3: 20191 of 25105 19.6% 52.03/s -22-May 18:36:08 test259 2.6 sec 4: 20187 of 25105 19.6% 1.51/s -22-May 18:36:08 test258 0.4 sec 20: 20167 of 25105 19.7% 56.51/s -22-May 18:36:09 test257 0.3 sec 41: 20126 of 25105 19.8% 142.48/s -22-May 18:36:09 test255 0.1 sec 8: 20118 of 25105 19.9% 131.14/s -22-May 18:36:09 test254 0.1 sec 14: 20104 of 25105 19.9% 240.15/s -22-May 18:36:15 test254 5.5 sec 20: 20084 of 25105 20.0% 3.63/s -22-May 18:36:15 test254 0.1 sec 1: 20083 of 25105 20.0% 17.63/s -22-May 18:36:15 test253 0.1 sec 9: 20074 of 25105 20.0% 61.02/s -22-May 18:36:15 test252 0.1 sec 7: 20067 of 25105 20.1% 102.93/s -22-May 18:37:44 test251 88.3 sec 434: 19633 of 25105 21.8% 4.92/s -22-May 18:41:28 test251 223.8 sec 78: 19555 of 25105 22.1% 0.35/s -22-May 18:41:29 test249 1.2 sec 24: 19531 of 25105 22.2% 19.20/s -22-May 18:41:29 test247 0.0 sec 24: 19507 of 25105 22.3% 1304.56/s -22-May 18:41:41 test246 11.1 sec 69: 19438 of 25105 22.6% 6.21/s -22-May 18:42:02 test01 21.1 sec 1339: 18099 of 25105 27.9% 63.47/s -22-May 18:42:03 test245 1.1 sec 34: 18065 of 25105 28.0% 30.17/s -22-May 18:42:03 test245 0.0 sec 8: 18057 of 25105 28.1% 451.93/s -22-May 18:42:03 test199 0.0 sec 1: 18056 of 25105 28.1% 236.18/s -22-May 18:42:04 test83 0.1 sec 10: 18046 of 25105 28.1% 162.79/s -22-May 18:42:04 test210 0.0 sec 7: 18039 of 25105 28.1% 2893.76/s -22-May 18:42:04 test165 0.0 sec 1: 18038 of 25105 28.1% 239.87/s -22-May 18:42:04 test219 0.1 sec 9: 18029 of 25105 28.2% 146.91/s -22-May 18:42:05 test219 0.3 sec 3: 18026 of 25105 28.2% 9.78/s -22-May 18:42:05 test241 0.1 sec 10: 18016 of 25105 28.2% 94.17/s -22-May 18:42:05 test220 0.1 sec 10: 18006 of 25105 28.3% 105.49/s -22-May 18:42:05 test211 0.0 sec 15: 17991 of 25105 28.3% 482.75/s -22-May 18:42:06 test202 0.1 sec 67: 17924 of 25105 28.6% 635.26/s -22-May 18:42:06 test202 0.0 sec 1: 17923 of 25105 28.6% 32.24/s -22-May 18:42:09 test152 3.2 sec 827: 17096 of 25105 31.9% 255.85/s -22-May 18:42:11 test152 1.4 sec 13: 17083 of 25105 32.0% 9.21/s -22-May 18:43:40 test152 89.1 sec 245: 16838 of 25105 32.9% 2.75/s -22-May 18:43:41 test222 0.1 sec 18: 16820 of 25105 33.0% 134.05/s -22-May 18:43:41 test256 0.7 sec 58: 16762 of 25105 33.2% 84.49/s -22-May 18:43:45 test186 3.1 sec 44: 16718 of 25105 33.4% 14.36/s -22-May 18:43:45 test186 0.4 sec 3: 16715 of 25105 33.4% 6.68/s -22-May 18:43:46 test186(0) 0.4 sec 5: 16710 of 25105 33.4% 11.62/s -22-May 18:43:46 test150 0.1 sec 36: 16674 of 25105 33.6% 289.39/s -22-May 18:43:47 test239 0.1 sec 15: 16659 of 25105 33.6% 160.60/s -22-May 18:43:48 test239 1.0 sec 2: 16657 of 25105 33.7% 1.91/s -22-May 18:43:48 test235 0.0 sec 4: 16653 of 25105 33.7% 102.00/s -22-May 18:43:48 test226 0.0 sec 8: 16645 of 25105 33.7% 656.76/s -22-May 18:43:49 test223 0.0 sec 2: 16643 of 25105 33.7% 71.61/s -22-May 18:43:49 test204 0.1 sec 14: 16629 of 25105 33.8% 119.97/s -22-May 18:43:49 test203 0.1 sec 9: 16620 of 25105 33.8% 152.16/s -22-May 18:43:49 test183 0.0 sec 12: 16608 of 25105 33.8% 462.77/s -22-May 18:43:50 test179 0.1 sec 15: 16593 of 25105 33.9% 146.96/s -22-May 18:43:52 test179 2.3 sec 4: 16589 of 25105 33.9% 1.76/s -22-May 18:43:53 test174 0.0 sec 10: 16579 of 25105 34.0% 239.85/s -22-May 18:43:53 test155 0.1 sec 41: 16538 of 25105 34.1% 343.00/s -22-May 18:43:53 test136 0.2 sec 55: 16483 of 25105 34.3% 332.95/s -22-May 18:43:54 test02 0.7 sec 247: 16236 of 25105 35.3% 332.14/s -22-May 18:43:55 test109 0.5 sec 10: 16226 of 25105 35.4% 21.57/s -22-May 18:43:55 test109 0.0 sec 4: 16222 of 25105 35.4% 1586.67/s -22-May 18:43:56 test109 0.4 sec 8: 16214 of 25105 35.4% 22.62/s -22-May 18:43:56 test04 0.1 sec 15: 16199 of 25105 35.5% 163.52/s -22-May 18:43:56 test207 0.0 sec 2: 16197 of 25105 35.5% 600.96/s -22-May 18:43:57 test221 0.0 sec 2: 16195 of 25105 35.5% 257.43/s -22-May 18:43:57 test162 0.1 sec 3: 16192 of 25105 35.5% 58.77/s -22-May 18:43:59 test159 1.2 sec 72: 16120 of 25105 35.8% 60.65/s -22-May 18:43:59 test09 0.0 sec 5: 16115 of 25105 35.8% 620.27/s -22-May 18:43:59 test132 0.1 sec 8: 16107 of 25105 35.8% 97.70/s -22-May 18:44:04 test141 4.5 sec 549: 15558 of 25105 38.0% 121.98/s -22-May 18:44:06 testc2(1,1) 1.4 sec 20: 15538 of 25105 38.1% 13.83/s -22-May 18:44:13 testc2(1,1) 7.5 sec 4: 15534 of 25105 38.1% 0.54/s -22-May 18:44:14 test214 0.0 sec 3: 15531 of 25105 38.1% 340.17/s -22-May 18:44:14 test213 0.0 sec 2: 15529 of 25105 38.1% 201.31/s -22-May 18:44:17 test206 2.7 sec 221: 15308 of 25105 39.0% 82.45/s -22-May 18:44:37 test206 19.5 sec 24: 15284 of 25105 39.1% 1.23/s -22-May 18:44:37 test212 0.0 sec 8: 15276 of 25105 39.2% 424.74/s -22-May 18:44:38 test212 0.2 sec 2: 15274 of 25105 39.2% 9.43/s -22-May 18:44:38 test128 0.3 sec 41: 15233 of 25105 39.3% 127.02/s -22-May 18:44:39 test82 0.1 sec 16: 15217 of 25105 39.4% 184.12/s -22-May 18:44:43 test229 3.5 sec 9: 15208 of 25105 39.4% 2.58/s -22-May 18:44:44 test229 0.8 sec 1: 15207 of 25105 39.4% 1.22/s -22-May 18:44:45 test144 0.6 sec 2: 15205 of 25105 39.4% 3.61/s -22-May 18:46:13 test14 88.4 sec 662: 14543 of 25105 42.1% 7.49/s -22-May 18:51:04 test14 290.4 sec 118: 14425 of 25105 42.5% 0.41/s -22-May 18:51:13 test180 8.4 sec 128: 14297 of 25105 43.1% 15.17/s -22-May 18:51:17 test236 3.7 sec 74: 14223 of 25105 43.3% 20.12/s -22-May 18:51:20 test232 2.4 sec 22: 14201 of 25105 43.4% 9.04/s -22-May 18:51:40 test228 19.7 sec 27: 14174 of 25105 43.5% 1.37/s -22-May 18:53:43 test154 122.2 sec 1506: 12668 of 25105 49.5% 12.33/s -22-May 18:55:53 test154 129.7 sec 2: 12666 of 25105 49.5% 0.02/s -22-May 18:56:08 test238 14.5 sec 54: 12612 of 25105 49.8% 3.73/s -22-May 18:57:25 test238 76.4 sec 9: 12603 of 25105 49.8% 0.12/s -22-May 18:59:12 test151b 107.3 sec 126: 12477 of 25105 50.3% 1.17/s -22-May 18:59:16 test184 3.2 sec 38: 12439 of 25105 50.5% 11.85/s -22-May 18:59:30 test191 13.3 sec 21: 12418 of 25105 50.5% 1.58/s -22-May 18:59:44 test191 13.8 sec 3: 12415 of 25105 50.5% 0.22/s -22-May 19:08:08 test188 503.5 sec 212: 12203 of 25105 51.4% 0.42/s -22-May 19:09:11 test188 61.7 sec 3: 12200 of 25105 51.4% 0.05/s -22-May 19:09:16 test224 5.1 sec 24: 12176 of 25105 51.5% 4.66/s -22-May 19:09:19 test196 2.4 sec 11: 12165 of 25105 51.5% 4.54/s -22-May 19:09:25 test209 5.3 sec 20: 12145 of 25105 51.6% 3.77/s -22-May 19:09:44 test104 18.9 sec 40: 12105 of 25105 51.8% 2.12/s -22-May 19:09:53 test189 8.8 sec 1: 12104 of 25105 51.8% 0.11/s -22-May 19:11:05 test194 70.8 sec 5: 12099 of 25105 51.8% 0.07/s -22-May 19:11:21 test76 15.8 sec 15: 12084 of 25105 51.9% 0.95/s -22-May 19:12:03 test244 41.7 sec 17: 12067 of 25105 51.9% 0.41/s -[malloc debugging turned off] -22-May 19:12:03 test201 0.0 sec 3: 12064 of 25105 51.9% 627.35/s -22-May 19:12:04 test225 0.1 sec 1: 12063 of 25105 51.9% 6.95/s -22-May 19:12:04 test176 0.1 sec 5: 12058 of 25105 52.0% 67.53/s -22-May 19:12:05 test208 0.0 sec 5: 12053 of 25105 52.0% 278.44/s -22-May 19:12:05 test216 0.1 sec 3: 12050 of 25105 52.0% 35.37/s -22-May 19:12:14 test142 8.0 sec 631: 11419 of 25105 54.5% 78.66/s -22-May 19:17:30 test142 316.0 sec 10: 11409 of 25105 54.6% 0.03/s -22-May 19:17:39 test142 7.8 sec 2: 11407 of 25105 54.6% 0.26/s -22-May 19:17:40 test137 0.4 sec 3: 11404 of 25105 54.6% 7.85/s -22-May 19:17:41 test137 0.0 sec 2: 11402 of 25105 54.6% 304.37/s -22-May 19:17:41 test139 0.3 sec 2: 11400 of 25105 54.6% 5.91/s -22-May 19:17:42 test172 0.1 sec 3: 11397 of 25105 54.6% 39.62/s -22-May 19:17:43 test148 0.8 sec 4: 11393 of 25105 54.6% 5.21/s -22-May 19:17:44 test157 0.6 sec 12: 11381 of 25105 54.7% 19.43/s -22-May 19:17:46 test182 0.9 sec 5: 11376 of 25105 54.7% 5.33/s -22-May 19:17:47 test108 0.6 sec 2: 11374 of 25105 54.7% 3.30/s -22-May 19:17:48 test108 0.2 sec 2: 11372 of 25105 54.7% 11.63/s -22-May 19:17:49 test130 0.8 sec 22: 11350 of 25105 54.8% 27.11/s -22-May 19:17:50 test124 0.2 sec 3: 11347 of 25105 54.8% 16.60/s -22-May 19:17:50 test138 0.0 sec 1: 11346 of 25105 54.8% 20.13/s -22-May 19:17:56 test227 4.7 sec 27: 11319 of 25105 54.9% 5.75/s -22-May 19:18:26 test125 29.7 sec 618: 10701 of 25105 57.4% 20.83/s -22-May 19:20:59 test234 152.8 sec 385: 10316 of 25105 58.9% 2.52/s -22-May 19:22:11 test234 70.8 sec 3: 10313 of 25105 58.9% 0.04/s -22-May 19:23:00 test242 48.4 sec 77: 10236 of 25105 59.2% 1.59/s -22-May 19:23:02 test173 1.5 sec 11: 10225 of 25105 59.3% 7.11/s -22-May 19:23:05 test200 3.2 sec 10: 10215 of 25105 59.3% 3.14/s -22-May 19:23:06 test197 0.1 sec 1: 10214 of 25105 59.3% 7.37/s -22-May 19:23:08 test84 1.3 sec 18: 10196 of 25105 59.4% 13.55/s -22-May 19:23:14 test19b 5.9 sec 59: 10137 of 25105 59.6% 10.04/s -22-May 19:23:15 test133 0.4 sec 2: 10135 of 25105 59.6% 5.20/s -22-May 19:23:20 test80 4.3 sec 12: 10123 of 25105 59.7% 2.78/s -22-May 19:23:40 test23 19.1 sec 148: 9975 of 25105 60.3% 7.75/s -22-May 19:23:43 test135 2.0 sec 7: 9968 of 25105 60.3% 3.59/s -22-May 19:25:02 test160 78.5 sec 24: 9944 of 25105 60.4% 0.31/s -22-May 19:25:08 test54 5.2 sec 20: 9924 of 25105 60.5% 3.81/s -22-May 19:25:09 test129 1.1 sec 4: 9920 of 25105 60.5% 3.49/s -22-May 19:25:12 test69 2.0 sec 6: 9914 of 25105 60.5% 3.03/s -22-May 19:26:46 test230 93.7 sec 114: 9800 of 25105 61.0% 1.22/s -22-May 19:39:09 test74 742.1 sec 6637: 3163 of 25105 87.4% 8.94/s -22-May 19:42:59 test127 229.7 sec 1703: 1460 of 25105 94.2% 7.41/s -22-May 19:43:03 test19 3.2 sec 12: 1448 of 25105 94.2% 3.74/s -22-May 19:43:08 test11 3.7 sec 3: 1445 of 25105 94.2% 0.81/s -22-May 19:43:11 test215 3.3 sec 1: 1444 of 25105 94.2% 0.31/s -22-May 19:43:29 test193 17.3 sec 5: 1439 of 25105 94.3% 0.29/s -22-May 19:46:15 test195 165.4 sec 39: 1400 of 25105 94.4% 0.24/s -22-May 19:46:41 test243 25.2 sec 7: 1393 of 25105 94.5% 0.28/s -22-May 19:46:49 test29 6.5 sec 3: 1390 of 25105 94.5% 0.46/s -22-May 19:46:50 testc2(0,0) 1.0 sec 7: 1383 of 25105 94.5% 7.33/s -22-May 19:47:13 testc2(0,0) 21.7 sec 1: 1382 of 25105 94.5% 0.05/s -22-May 19:47:14 testc4(0) 0.5 sec 4: 1378 of 25105 94.5% 7.51/s -22-May 19:47:29 testc7(0) 14.8 sec 2: 1376 of 25105 94.5% 0.14/s -22-May 19:47:35 testcc(1) 5.2 sec 1: 1375 of 25105 94.5% 0.19/s -22-May 19:47:45 test187 8.7 sec 3: 1372 of 25105 94.5% 0.34/s -22-May 19:47:51 test192 5.9 sec 1: 1371 of 25105 94.5% 0.17/s -22-May 19:48:11 test181 19.1 sec 4: 1367 of 25105 94.6% 0.21/s -22-May 19:50:06 test185 114.0 sec 6: 1361 of 25105 94.6% 0.05/s -22-May 19:50:53 test53 46.6 sec 4: 1357 of 25105 94.6% 0.09/s -22-May 19:51:44 test17 50.2 sec 27: 1330 of 25105 94.7% 0.54/s -22-May 19:59:16 test231 451.5 sec 162: 1168 of 25105 95.3% 0.36/s -22-May 20:54:05 test10 3288.1 sec 968: 200 of 25105 99.2% 0.29/s -22-May 21:13:05 test75b 1139.1 sec 155: 45 of 25105 99.8% 0.14/s -22-May 21:14:37 test21b 90.8 sec 26: 19 of 25105 99.9% 0.29/s -22-May 21:15:31 testca(1) 53.1 sec 5: 14 of 25105 99.9% 0.09/s -22-May 21:17:31 test81 119.2 sec 1: 13 of 25105 99.9% 0.01/s -22-May 21:23:42 test18 370.4 sec 13: all 25105 full 100% 0.04/s -[malloc debugging turned back on] diff --git a/GraphBLAS/Tcov/log_May30.txt b/GraphBLAS/Tcov/log_May30.txt new file mode 100644 index 0000000000..66092abf0c --- /dev/null +++ b/GraphBLAS/Tcov/log_May30.txt @@ -0,0 +1,205 @@ + +---------------------------------------------- [malloc] [cover] +30-May 11:34:02 test169 9.3 sec 550: 24389 of 25104 2.8% 58.91/s +30-May 11:34:03 test250 1.3 sec 373: 24016 of 25104 4.3% 281.53/s +30-May 11:34:05 test250 2.1 sec 57: 23959 of 25104 4.6% 27.34/s +30-May 11:34:05 test279 0.1 sec 119: 23840 of 25104 5.0% 1022.28/s +30-May 11:34:06 test278 0.1 sec 48: 23792 of 25104 5.2% 500.34/s +30-May 11:34:06 test277 0.1 sec 38: 23754 of 25104 5.4% 381.46/s +30-May 11:34:06 test276 0.1 sec 1626: 22128 of 25104 11.9% 15620.95/s +30-May 11:34:06 test275 0.1 sec 117: 22011 of 25104 12.3% 1131.07/s +30-May 11:34:06 test274 0.1 sec 129: 21882 of 25104 12.8% 1281.38/s +30-May 11:34:06 test273 0.2 sec 114: 21768 of 25104 13.3% 564.32/s +30-May 11:34:07 test272 0.1 sec 11: 21757 of 25104 13.3% 95.96/s +30-May 11:34:07 test271 0.1 sec 497: 21260 of 25104 15.3% 4563.69/s +30-May 11:34:07 test270 0.1 sec 286: 20974 of 25104 16.5% 2535.48/s +30-May 11:34:07 test269 0.1 sec 83: 20891 of 25104 16.8% 754.53/s +30-May 11:34:07 test268 0.1 sec 5: 20886 of 25104 16.8% 39.55/s +30-May 11:34:10 test145 2.3 sec 210: 20676 of 25104 17.6% 91.11/s +30-May 11:34:10 test145 0.0 sec 1: 20675 of 25104 17.6% 30.47/s +30-May 11:34:10 test145 0.0 sec 18: 20657 of 25104 17.7% 761.61/s +30-May 11:34:10 test145 0.0 sec 4: 20653 of 25104 17.7% 213.02/s +30-May 11:34:11 test145 1.5 sec 34: 20619 of 25104 17.9% 22.47/s +30-May 11:34:11 test145 0.0 sec 3: 20616 of 25104 17.9% 179.08/s +30-May 11:34:13 test240 1.2 sec 74: 20539 of 25104 18.2% 63.93/s +30-May 11:34:13 test240 0.3 sec 1: 20538 of 25104 18.2% 3.51/s +30-May 11:34:14 test237 1.0 sec 40: 20498 of 25104 18.3% 38.95/s +30-May 11:34:17 test237 2.5 sec 2: 20496 of 25104 18.4% 0.80/s +30-May 11:34:17 test237 0.0 sec 18: 20478 of 25104 18.4% 371.73/s +30-May 11:34:17 test237 0.0 sec 6: 20472 of 25104 18.5% 202.56/s +30-May 11:34:17 test237 0.0 sec 4: 20468 of 25104 18.5% 116.25/s +30-May 11:34:18 test267 0.7 sec 8: 20460 of 25104 18.5% 11.39/s +30-May 11:34:18 test267 0.0 sec 1: 20459 of 25104 18.5% 2096.44/s +30-May 11:34:19 test265 0.5 sec 36: 20423 of 25104 18.6% 66.17/s +30-May 11:34:19 test264 0.1 sec 173: 20250 of 25104 19.3% 1714.84/s +30-May 11:34:20 test263 0.8 sec 13: 20237 of 25104 19.4% 15.65/s +30-May 11:34:20 test262 0.1 sec 22: 20215 of 25104 19.5% 217.32/s +30-May 11:34:20 test261 0.1 sec 22: 20193 of 25104 19.6% 222.54/s +30-May 11:34:20 test260 0.1 sec 3: 20190 of 25104 19.6% 30.81/s +30-May 11:34:23 test259 2.5 sec 4: 20186 of 25104 19.6% 1.61/s +30-May 11:34:23 test258 0.4 sec 20: 20166 of 25104 19.7% 54.07/s +30-May 11:34:24 test257 0.3 sec 41: 20125 of 25104 19.8% 144.71/s +30-May 11:34:24 test255 0.1 sec 8: 20117 of 25104 19.9% 82.10/s +30-May 11:34:24 test254 0.1 sec 14: 20103 of 25104 19.9% 221.68/s +30-May 11:34:29 test254 4.9 sec 20: 20083 of 25104 20.0% 4.07/s +30-May 11:34:29 test254 0.1 sec 1: 20082 of 25104 20.0% 14.81/s +30-May 11:34:30 test253 0.2 sec 9: 20073 of 25104 20.0% 48.80/s +30-May 11:34:30 test252 0.1 sec 7: 20066 of 25104 20.1% 72.31/s +30-May 11:35:56 test251 85.9 sec 434: 19632 of 25104 21.8% 5.05/s +30-May 11:39:27 test251 211.4 sec 78: 19554 of 25104 22.1% 0.37/s +30-May 11:39:29 test249 1.3 sec 24: 19530 of 25104 22.2% 18.13/s +30-May 11:39:29 test247 0.0 sec 24: 19506 of 25104 22.3% 1092.05/s +30-May 11:39:41 test246 11.2 sec 69: 19437 of 25104 22.6% 6.16/s +30-May 11:39:59 test01 18.6 sec 1337: 18100 of 25104 27.9% 72.04/s +30-May 11:40:00 test245 1.0 sec 34: 18066 of 25104 28.0% 34.22/s +30-May 11:40:01 test245 0.0 sec 8: 18058 of 25104 28.1% 429.69/s +30-May 11:40:01 test199 0.0 sec 1: 18057 of 25104 28.1% 143.97/s +30-May 11:40:01 test83 0.1 sec 10: 18047 of 25104 28.1% 99.14/s +30-May 11:40:01 test210 0.0 sec 7: 18040 of 25104 28.1% 1506.67/s +30-May 11:40:01 test165 0.0 sec 1: 18039 of 25104 28.1% 86.07/s +30-May 11:40:02 test219 0.1 sec 9: 18030 of 25104 28.2% 93.20/s +30-May 11:40:02 test219 0.3 sec 3: 18027 of 25104 28.2% 10.54/s +30-May 11:40:02 test241 0.1 sec 10: 18017 of 25104 28.2% 85.59/s +30-May 11:40:03 test220 0.1 sec 10: 18007 of 25104 28.3% 72.97/s +30-May 11:40:03 test211 0.0 sec 15: 17992 of 25104 28.3% 406.09/s +30-May 11:40:03 test202 0.1 sec 67: 17925 of 25104 28.6% 467.21/s +30-May 11:40:03 test202 0.0 sec 1: 17924 of 25104 28.6% 31.04/s +30-May 11:40:07 test152 3.1 sec 827: 17097 of 25104 31.9% 263.10/s +30-May 11:40:08 test152 1.6 sec 13: 17084 of 25104 31.9% 8.28/s +30-May 11:41:27 test152 78.3 sec 245: 16839 of 25104 32.9% 3.13/s +30-May 11:41:27 test222 0.2 sec 18: 16821 of 25104 33.0% 90.68/s +30-May 11:41:28 test256 0.6 sec 58: 16763 of 25104 33.2% 89.29/s +30-May 11:41:32 test186 3.0 sec 44: 16719 of 25104 33.4% 14.52/s +30-May 11:41:32 test186 0.4 sec 3: 16716 of 25104 33.4% 6.91/s +30-May 11:41:33 test186(0) 0.4 sec 5: 16711 of 25104 33.4% 11.81/s +30-May 11:41:33 test150 0.2 sec 36: 16675 of 25104 33.6% 208.98/s +30-May 11:41:34 test239 0.1 sec 15: 16660 of 25104 33.6% 112.25/s +30-May 11:41:35 test239 1.0 sec 2: 16658 of 25104 33.6% 1.98/s +30-May 11:41:35 test235 0.0 sec 4: 16654 of 25104 33.7% 93.12/s +30-May 11:41:35 test226 0.0 sec 8: 16646 of 25104 33.7% 545.93/s +30-May 11:41:35 test223 0.0 sec 2: 16644 of 25104 33.7% 61.68/s +30-May 11:41:36 test204 0.2 sec 14: 16630 of 25104 33.8% 75.66/s +30-May 11:41:36 test203 0.1 sec 9: 16621 of 25104 33.8% 88.16/s +30-May 11:41:36 test183 0.0 sec 12: 16609 of 25104 33.8% 374.65/s +30-May 11:41:37 test179 0.2 sec 15: 16594 of 25104 33.9% 82.15/s +30-May 11:41:39 test179 1.9 sec 4: 16590 of 25104 33.9% 2.06/s +30-May 11:41:39 test174 0.1 sec 10: 16580 of 25104 34.0% 154.65/s +30-May 11:41:40 test155 0.3 sec 41: 16539 of 25104 34.1% 140.44/s +30-May 11:41:41 test136 0.3 sec 55: 16484 of 25104 34.3% 165.38/s +30-May 11:41:42 test02 1.0 sec 247: 16237 of 25104 35.3% 256.76/s +30-May 11:41:43 test109 0.5 sec 10: 16227 of 25104 35.4% 22.18/s +30-May 11:41:43 test109 0.0 sec 4: 16223 of 25104 35.4% 1254.71/s +30-May 11:41:43 test109 0.4 sec 8: 16215 of 25104 35.4% 21.84/s +30-May 11:41:44 test04 0.1 sec 15: 16200 of 25104 35.5% 117.25/s +30-May 11:41:44 test207 0.0 sec 2: 16198 of 25104 35.5% 355.24/s +30-May 11:41:44 test221 0.0 sec 2: 16196 of 25104 35.5% 214.87/s +30-May 11:41:45 test162 0.1 sec 3: 16193 of 25104 35.5% 52.93/s +30-May 11:41:46 test159 1.3 sec 72: 16121 of 25104 35.8% 54.17/s +30-May 11:41:47 test09 0.0 sec 5: 16116 of 25104 35.8% 494.46/s +30-May 11:41:47 test132 0.1 sec 8: 16108 of 25104 35.8% 65.17/s +30-May 11:41:52 test141 4.8 sec 549: 15559 of 25104 38.0% 113.27/s +30-May 11:41:54 testc2(1,1) 1.4 sec 20: 15539 of 25104 38.1% 14.16/s +30-May 11:42:01 testc2(1,1) 7.3 sec 4: 15535 of 25104 38.1% 0.55/s +30-May 11:42:02 test214 0.0 sec 3: 15532 of 25104 38.1% 163.45/s +30-May 11:42:02 test213 0.0 sec 2: 15530 of 25104 38.1% 129.77/s +30-May 11:42:06 test206 2.9 sec 221: 15309 of 25104 39.0% 76.72/s +30-May 11:42:24 test206 17.7 sec 24: 15285 of 25104 39.1% 1.36/s +30-May 11:42:24 test212 0.0 sec 8: 15277 of 25104 39.1% 378.36/s +30-May 11:42:24 test212 0.2 sec 2: 15275 of 25104 39.2% 10.38/s +30-May 11:42:25 test128 0.3 sec 41: 15234 of 25104 39.3% 119.84/s +30-May 11:42:25 test82 0.1 sec 16: 15218 of 25104 39.4% 172.02/s +30-May 11:42:29 test229 3.2 sec 10: 15208 of 25104 39.4% 3.11/s +30-May 11:42:30 test229 0.9 sec 1: 15207 of 25104 39.4% 1.17/s +30-May 11:42:31 test144 0.6 sec 2: 15205 of 25104 39.4% 3.35/s +30-May 11:43:56 test14 85.0 sec 662: 14543 of 25104 42.1% 7.79/s +30-May 11:49:41 test14 344.7 sec 118: 14425 of 25104 42.5% 0.34/s +30-May 11:50:00 test180 16.8 sec 128: 14297 of 25104 43.0% 7.64/s +30-May 11:50:22 test236 21.7 sec 74: 14223 of 25104 43.3% 3.41/s +30-May 11:50:40 test232 17.5 sec 22: 14201 of 25104 43.4% 1.26/s +30-May 11:51:59 test228 79.2 sec 27: 14174 of 25104 43.5% 0.34/s +30-May 11:54:19 test154 139.0 sec 1506: 12668 of 25104 49.5% 10.83/s +30-May 11:56:32 test154 133.1 sec 2: 12666 of 25104 49.5% 0.02/s +30-May 11:56:48 test238 14.7 sec 54: 12612 of 25104 49.8% 3.68/s +30-May 11:57:59 test238 70.7 sec 9: 12603 of 25104 49.8% 0.13/s +30-May 11:59:42 test151b 103.4 sec 126: 12477 of 25104 50.3% 1.22/s +30-May 11:59:46 test184 3.1 sec 38: 12439 of 25104 50.5% 12.45/s +30-May 12:00:00 test191 13.4 sec 21: 12418 of 25104 50.5% 1.57/s +30-May 12:00:14 test191 14.3 sec 3: 12415 of 25104 50.5% 0.21/s +30-May 12:07:53 test188 458.1 sec 212: 12203 of 25104 51.4% 0.46/s +30-May 12:08:57 test188 63.1 sec 3: 12200 of 25104 51.4% 0.05/s +30-May 12:09:03 test224 5.2 sec 24: 12176 of 25104 51.5% 4.61/s +30-May 12:09:06 test196 2.5 sec 11: 12165 of 25104 51.5% 4.42/s +30-May 12:09:12 test209 5.5 sec 20: 12145 of 25104 51.6% 3.64/s +30-May 12:09:31 test104 19.3 sec 40: 12105 of 25104 51.8% 2.07/s +30-May 12:09:40 test189 8.1 sec 1: 12104 of 25104 51.8% 0.12/s +30-May 12:10:54 test194 73.7 sec 5: 12099 of 25104 51.8% 0.07/s +30-May 12:11:11 test76 16.2 sec 15: 12084 of 25104 51.9% 0.92/s +30-May 12:11:54 test244 43.0 sec 17: 12067 of 25104 51.9% 0.40/s +[malloc debugging turned off] +30-May 12:11:55 test201 0.0 sec 3: 12064 of 25104 51.9% 356.42/s +30-May 12:11:55 test225 0.1 sec 1: 12063 of 25104 51.9% 6.90/s +30-May 12:11:56 test176 0.1 sec 5: 12058 of 25104 52.0% 64.19/s +30-May 12:11:56 test208 0.0 sec 5: 12053 of 25104 52.0% 262.38/s +30-May 12:11:57 test216 0.1 sec 3: 12050 of 25104 52.0% 28.05/s +30-May 12:12:06 test142 8.4 sec 631: 11419 of 25104 54.5% 75.07/s +30-May 12:16:51 test142 285.1 sec 10: 11409 of 25104 54.6% 0.04/s +30-May 12:17:01 test142 8.3 sec 2: 11407 of 25104 54.6% 0.24/s +30-May 12:17:02 test137 0.4 sec 3: 11404 of 25104 54.6% 7.22/s +30-May 12:17:02 test137 0.0 sec 2: 11402 of 25104 54.6% 300.30/s +30-May 12:17:03 test139 0.5 sec 2: 11400 of 25104 54.6% 4.27/s +30-May 12:17:04 test172 0.1 sec 3: 11397 of 25104 54.6% 37.98/s +30-May 12:17:05 test148 0.9 sec 4: 11393 of 25104 54.6% 4.48/s +30-May 12:17:06 test157 0.7 sec 12: 11381 of 25104 54.7% 18.15/s +30-May 12:17:08 test182 1.0 sec 5: 11376 of 25104 54.7% 5.16/s +30-May 12:17:09 test108 0.6 sec 2: 11374 of 25104 54.7% 3.12/s +30-May 12:17:09 test108 0.2 sec 2: 11372 of 25104 54.7% 11.65/s +30-May 12:17:11 test130 0.9 sec 22: 11350 of 25104 54.8% 25.54/s +30-May 12:17:11 test124 0.2 sec 3: 11347 of 25104 54.8% 16.66/s +30-May 12:17:12 test138 0.1 sec 1: 11346 of 25104 54.8% 19.60/s +30-May 12:17:17 test227 4.7 sec 27: 11319 of 25104 54.9% 5.69/s +30-May 12:17:48 test125 30.5 sec 618: 10701 of 25104 57.4% 20.24/s +30-May 12:20:20 test234 150.8 sec 385: 10316 of 25104 58.9% 2.55/s +30-May 12:21:34 test234 73.8 sec 3: 10313 of 25104 58.9% 0.04/s +30-May 12:22:24 test242 48.8 sec 77: 10236 of 25104 59.2% 1.58/s +30-May 12:22:26 test173 1.5 sec 11: 10225 of 25104 59.3% 7.11/s +30-May 12:22:30 test200 3.2 sec 10: 10215 of 25104 59.3% 3.17/s +30-May 12:22:30 test197 0.1 sec 1: 10214 of 25104 59.3% 7.24/s +30-May 12:22:32 test84 1.4 sec 18: 10196 of 25104 59.4% 13.17/s +30-May 12:22:39 test19b 6.0 sec 59: 10137 of 25104 59.6% 9.85/s +30-May 12:22:40 test133 0.4 sec 2: 10135 of 25104 59.6% 5.01/s +30-May 12:22:45 test80 4.3 sec 12: 10123 of 25104 59.7% 2.78/s +30-May 12:23:05 test23 20.0 sec 148: 9975 of 25104 60.3% 7.42/s +30-May 12:23:08 test135 2.0 sec 7: 9968 of 25104 60.3% 3.54/s +30-May 12:24:30 test160 81.3 sec 24: 9944 of 25104 60.4% 0.30/s +30-May 12:24:36 test54 5.3 sec 20: 9924 of 25104 60.5% 3.74/s +30-May 12:24:37 test129 1.2 sec 4: 9920 of 25104 60.5% 3.28/s +30-May 12:24:40 test69 2.1 sec 6: 9914 of 25104 60.5% 2.84/s +30-May 12:26:17 test230 96.5 sec 114: 9800 of 25104 61.0% 1.18/s +30-May 12:38:53 test74 754.5 sec 6637: 3163 of 25104 87.4% 8.80/s +30-May 12:42:51 test127 237.5 sec 1703: 1460 of 25104 94.2% 7.17/s +30-May 12:42:55 test19 3.2 sec 12: 1448 of 25104 94.2% 3.70/s +30-May 12:42:59 test11 3.9 sec 3: 1445 of 25104 94.2% 0.78/s +30-May 12:43:03 test215 3.3 sec 1: 1444 of 25104 94.2% 0.30/s +30-May 12:43:22 test193 17.8 sec 5: 1439 of 25104 94.3% 0.28/s +30-May 12:46:09 test195 167.0 sec 39: 1400 of 25104 94.4% 0.23/s +30-May 12:46:35 test243 25.5 sec 7: 1393 of 25104 94.5% 0.27/s +30-May 12:46:43 test29 6.8 sec 3: 1390 of 25104 94.5% 0.44/s +30-May 12:46:45 testc2(0,0) 1.0 sec 7: 1383 of 25104 94.5% 6.97/s +30-May 12:47:05 testc2(0,0) 19.8 sec 1: 1382 of 25104 94.5% 0.05/s +30-May 12:47:06 testc4(0) 0.7 sec 4: 1378 of 25104 94.5% 6.08/s +30-May 12:47:21 testc7(0) 14.4 sec 2: 1376 of 25104 94.5% 0.14/s +30-May 12:47:27 testcc(1) 5.1 sec 1: 1375 of 25104 94.5% 0.20/s +30-May 12:47:37 test187 8.8 sec 3: 1372 of 25104 94.5% 0.34/s +30-May 12:47:43 test192 6.0 sec 1: 1371 of 25104 94.5% 0.17/s +30-May 12:48:04 test181 19.5 sec 4: 1367 of 25104 94.6% 0.20/s +30-May 12:49:57 test185 112.9 sec 6: 1361 of 25104 94.6% 0.05/s +30-May 12:50:43 test53 45.0 sec 4: 1357 of 25104 94.6% 0.09/s +30-May 12:51:35 test17 51.3 sec 27: 1330 of 25104 94.7% 0.53/s +30-May 12:59:15 test231 459.4 sec 162: 1168 of 25104 95.3% 0.35/s +30-May 13:49:14 test10 2998.5 sec 968: 200 of 25104 99.2% 0.32/s +30-May 14:07:56 test75b 1121.1 sec 155: 45 of 25104 99.8% 0.14/s +30-May 14:09:30 test21b 92.8 sec 26: 19 of 25104 99.9% 0.28/s +30-May 14:10:24 testca(1) 53.1 sec 5: 14 of 25104 99.9% 0.09/s +30-May 14:12:23 test81 118.4 sec 1: 13 of 25104 99.9% 0.01/s +30-May 14:18:49 test18 385.6 sec 13: all 25104 full 100% 0.03/s +[malloc debugging turned back on] diff --git a/GraphBLAS/Test/GB_mex.h b/GraphBLAS/Test/GB_mex.h index 4f19ee3147..ed6265b8de 100644 --- a/GraphBLAS/Test/GB_mex.h +++ b/GraphBLAS/Test/GB_mex.h @@ -10,19 +10,19 @@ #ifndef GB_MEXH #define GB_MEXH -#include "GB_mxm.h" -#include "GB_Pending.h" -#include "GB_add.h" -#include "GB_subref.h" -#include "GB_transpose.h" -#include "GB_sort.h" -#include "GB_apply.h" +#include "../Source/mxm/GB_mxm.h" +#include "../Source/pending/GB_Pending.h" +#include "../Source/ewise/GB_add.h" +#include "../Source/extract/GB_subref.h" +#include "../Source/transpose/GB_transpose.h" +#include "../Source/sort/GB_sort.h" +#include "../Source/apply/GB_apply.h" #include "GB_mex_generic.h" #undef OK #include "GB_mx_usercomplex.h" #include "mex.h" #include "matrix.h" -#include "GB_dev.h" +#include "../Source/include/GB_dev.h" #define SIMPLE_RAND_MAX 32767 uint64_t simple_rand (void) ; diff --git a/GraphBLAS/Test/GB_mex_mxm.c b/GraphBLAS/Test/GB_mex_mxm.c index 151c185f54..2a802a1b20 100644 --- a/GraphBLAS/Test/GB_mex_mxm.c +++ b/GraphBLAS/Test/GB_mex_mxm.c @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ #include "GB_mex.h" -#include "GB_stringify.h" #define USAGE "C = GB_mex_mxm (C, M, accum, semiring, A, B, desc, macrofy)" diff --git a/GraphBLAS/Test/GB_mex_plusplus.c b/GraphBLAS/Test/GB_mex_plusplus.c index 2af4f189ed..63b145c7da 100644 --- a/GraphBLAS/Test/GB_mex_plusplus.c +++ b/GraphBLAS/Test/GB_mex_plusplus.c @@ -8,7 +8,6 @@ //------------------------------------------------------------------------------ #include "GB_mex.h" -#include "GB_stringify.h" #define USAGE "C = GB_mex_plusplus (C, M, accum, [ ], A, B, desc, macrofy)" diff --git a/GraphBLAS/Test/GB_mex_rdiv.c b/GraphBLAS/Test/GB_mex_rdiv.c index bd02c670b8..5a1bdba3c0 100644 --- a/GraphBLAS/Test/GB_mex_rdiv.c +++ b/GraphBLAS/Test/GB_mex_rdiv.c @@ -2,7 +2,7 @@ // GB_mex_rdiv: compute C=A*B with the rdiv operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 //------------------------------------------------------------------------------ @@ -56,6 +56,7 @@ GrB_BinaryOp My_rdiv = NULL ; "{\n" \ " // escape this quote: \"\n" \ " /* escape this backslash \\ */\n" \ +" /* modified for GrB 9.3.0 */\n" \ " (*z) = (*y) / (*x) ;\n" \ "}" diff --git a/GraphBLAS/Test/GB_mex_test1.c b/GraphBLAS/Test/GB_mex_test1.c index 44d943e043..1deaef1692 100644 --- a/GraphBLAS/Test/GB_mex_test1.c +++ b/GraphBLAS/Test/GB_mex_test1.c @@ -11,7 +11,6 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_AxB_saxpy.h" #define USAGE "GB_mex_test1" @@ -750,11 +749,11 @@ void mexFunction GB_Global_hack_set (1, save1) ; CHECK (GB_Global_hack_get (1) == save1) ; //-------------------------------------------------------------------------- - // GB_pslice + // GB_p_slice //-------------------------------------------------------------------------- int64_t Slice [30] ; - GB_pslice (Slice, NULL, 0, 4, true) ; + GB_p_slice (Slice, NULL, 0, 4, true) ; for (int t = 0 ; t < 4 ; t++) CHECK (Slice [t] == 0) ; //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_mex_test11.c b/GraphBLAS/Test/GB_mex_test11.c index b84675238e..9b5cb7d9e3 100644 --- a/GraphBLAS/Test/GB_mex_test11.c +++ b/GraphBLAS/Test/GB_mex_test11.c @@ -9,8 +9,8 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_file.h" -#include "GB_jitifyer.h" +#include "../Source/jitifyer/GB_file.h" +#include "../Source/jitifyer/GB_jitifyer.h" #define USAGE "GB_mex_test11" diff --git a/GraphBLAS/Test/GB_mex_test16.c b/GraphBLAS/Test/GB_mex_test16.c index 998f111825..59a12474dd 100644 --- a/GraphBLAS/Test/GB_mex_test16.c +++ b/GraphBLAS/Test/GB_mex_test16.c @@ -9,7 +9,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_stringify.h" +#include "../Source/jitifyer/GB_stringify.h" #define USAGE "GB_mex_test16" diff --git a/GraphBLAS/Test/GB_mex_test18.c b/GraphBLAS/Test/GB_mex_test18.c index f586831b7f..09ef7e1918 100644 --- a/GraphBLAS/Test/GB_mex_test18.c +++ b/GraphBLAS/Test/GB_mex_test18.c @@ -9,7 +9,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_stringify.h" +#include "../Source/jitifyer/GB_stringify.h" #define USAGE "GB_mex_test18" diff --git a/GraphBLAS/Test/GB_mex_test2.c b/GraphBLAS/Test/GB_mex_test2.c index 9620949990..3ce314aa4b 100644 --- a/GraphBLAS/Test/GB_mex_test2.c +++ b/GraphBLAS/Test/GB_mex_test2.c @@ -11,7 +11,6 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_ij.h" #define USAGE "GB_mex_test2" @@ -128,15 +127,15 @@ void mexFunction GrB_Scalar_free_(&scalar) ; //-------------------------------------------------------------------------- - // GB_pslice + // GB_p_slice //-------------------------------------------------------------------------- int64_t Slice [30] ; - GB_pslice (Slice, A->p, n, 2, true) ; + GB_p_slice (Slice, A->p, n, 2, true) ; CHECK (Slice [0] == 0) ; int64_t Ap [11] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; - GB_pslice (Slice, Ap, 10, 10, false) ; + GB_p_slice (Slice, Ap, 10, 10, false) ; printf ("Slice: ") ; for (int k = 0 ; k <= 10 ; k++) printf (" %ld", Slice [k]) ; printf ("\n") ; diff --git a/GraphBLAS/Test/GB_mex_test20.c b/GraphBLAS/Test/GB_mex_test20.c index 5ace4a5299..1c247dd62c 100644 --- a/GraphBLAS/Test/GB_mex_test20.c +++ b/GraphBLAS/Test/GB_mex_test20.c @@ -9,7 +9,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_mask.h" +#include "../Source/mask/GB_mask.h" #define USAGE "GB_mex_test20" diff --git a/GraphBLAS/Test/GB_mex_test21.c b/GraphBLAS/Test/GB_mex_test21.c index ef7f4c58dc..8c42a5e545 100644 --- a/GraphBLAS/Test/GB_mex_test21.c +++ b/GraphBLAS/Test/GB_mex_test21.c @@ -20,7 +20,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_stringify.h" +#include "../Source/jitifyer/GB_stringify.h" #define USAGE "GB_mex_test21" #define HEADER fprintf (fp, "\n\n================================================================================\n") ; diff --git a/GraphBLAS/Test/GB_mex_test24.c b/GraphBLAS/Test/GB_mex_test24.c index 97c8ee834e..8cca6c6b87 100644 --- a/GraphBLAS/Test/GB_mex_test24.c +++ b/GraphBLAS/Test/GB_mex_test24.c @@ -9,7 +9,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_stringify.h" +#include "../Source/jitifyer/GB_stringify.h" #define USAGE "GB_mex_test24" diff --git a/GraphBLAS/Test/GB_mex_test25.c b/GraphBLAS/Test/GB_mex_test25.c index ab9ad206fd..6c2c28379c 100644 --- a/GraphBLAS/Test/GB_mex_test25.c +++ b/GraphBLAS/Test/GB_mex_test25.c @@ -9,7 +9,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_get_set.h" +#include "../Source/get_set/GB_get_set.h" #define USAGE "GB_mex_test25" diff --git a/GraphBLAS/Test/GB_mex_test3.c b/GraphBLAS/Test/GB_mex_test3.c index e860714c9e..dd26bda547 100644 --- a/GraphBLAS/Test/GB_mex_test3.c +++ b/GraphBLAS/Test/GB_mex_test3.c @@ -11,7 +11,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_bitmap_assign_methods.h" +#include "../Source/assign/GB_bitmap_assign_methods.h" #define USAGE "GB_mex_test3" @@ -669,16 +669,16 @@ void mexFunction CHECK (GB_unop_one (GB_UDT_code) == NULL) ; //-------------------------------------------------------------------------- - // GB_check_if_iso + // GB_all_entries_are_iso //-------------------------------------------------------------------------- - CHECK (!GB_check_if_iso (NULL)) ; + CHECK (!GB_all_entries_are_iso (NULL)) ; OK (GrB_Matrix_new (&C, GrB_FP32, 10, 10)) ; OK (GrB_Matrix_assign_FP32 (C, NULL, NULL, 1, GrB_ALL, 4, GrB_ALL, 4, NULL)) ; OK (GxB_Matrix_Option_set (C, GxB_SPARSITY_CONTROL, GxB_SPARSE)) ; OK (GrB_Matrix_wait_(C, GrB_MATERIALIZE)) ; - CHECK (GB_check_if_iso (C)) ; + CHECK (GB_all_entries_are_iso (C)) ; GrB_Matrix_free_(&C) ; OK (GrB_Matrix_new (&C, My4x64, 10, 10)) ; @@ -689,15 +689,15 @@ void mexFunction my4x64_scalar.stuff [3] = 4 ; OK (GrB_Matrix_setElement_UDT (C, &my4x64_scalar, 3, 2)) ; OK (GrB_Matrix_setElement_UDT (C, &my4x64_scalar, 0, 0)) ; - CHECK (!GB_check_if_iso (C)) ; + CHECK (!GB_all_entries_are_iso (C)) ; OK (GrB_Matrix_wait_(C, GrB_MATERIALIZE)) ; - CHECK (GB_check_if_iso (C)) ; + CHECK (GB_all_entries_are_iso (C)) ; my4x64_scalar.stuff [0] = 4 ; OK (GrB_Matrix_setElement_UDT (C, &my4x64_scalar, 4, 4)) ; - CHECK (!GB_check_if_iso (C)) ; + CHECK (!GB_all_entries_are_iso (C)) ; OK (GrB_Matrix_wait_(C, GrB_MATERIALIZE)) ; - CHECK (!GB_check_if_iso (C)) ; + CHECK (!GB_all_entries_are_iso (C)) ; GrB_Matrix_free_(&C) ; //-------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_mex_test5.c b/GraphBLAS/Test/GB_mex_test5.c index 7d48a17de0..cd6ff0cbd1 100644 --- a/GraphBLAS/Test/GB_mex_test5.c +++ b/GraphBLAS/Test/GB_mex_test5.c @@ -11,7 +11,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_serialize.h" +#include "../Source/serialize/GB_serialize.h" #define USAGE "GB_mex_test5" #define FREE_ALL ; diff --git a/GraphBLAS/Test/GB_mex_test6.c b/GraphBLAS/Test/GB_mex_test6.c index 128f6bc032..865f7a26bc 100644 --- a/GraphBLAS/Test/GB_mex_test6.c +++ b/GraphBLAS/Test/GB_mex_test6.c @@ -11,7 +11,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_serialize.h" +#include "../Source/serialize/GB_serialize.h" #define USAGE "GB_mex_test6" #define FREE_ALL ; diff --git a/GraphBLAS/Test/GB_mex_test9.c b/GraphBLAS/Test/GB_mex_test9.c index 1f5de9ce09..e3aff26c21 100644 --- a/GraphBLAS/Test/GB_mex_test9.c +++ b/GraphBLAS/Test/GB_mex_test9.c @@ -11,7 +11,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_stringify.h" +#include "../Source/jitifyer/GB_stringify.h" #define USAGE "GB_mex_test9" #define FREE_ALL ; diff --git a/GraphBLAS/Test/GB_mx_get_global.c b/GraphBLAS/Test/GB_mx_get_global.c index 31adcb6fe4..9a11be6fc2 100644 --- a/GraphBLAS/Test/GB_mx_get_global.c +++ b/GraphBLAS/Test/GB_mx_get_global.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB_mex.h" -#include "GB_jitifyer.h" +#include "../Source/jitifyer/GB_jitifyer.h" bool GB_mx_get_global // true if doing malloc_debug ( diff --git a/GraphBLAS/Test/GB_mx_semiring.c b/GraphBLAS/Test/GB_mx_semiring.c index dbd204a874..22e1e0be2c 100644 --- a/GraphBLAS/Test/GB_mx_semiring.c +++ b/GraphBLAS/Test/GB_mx_semiring.c @@ -8,7 +8,7 @@ //------------------------------------------------------------------------------ #include "GB_mex.h" -#include "GB_binop.h" +#include "../Source/binaryop/GB_binop.h" // See GraphBLAS/GraphBLAS/@GrB/private/util/gb_semiring.c for a description diff --git a/GraphBLAS/Test/make.m b/GraphBLAS/Test/make.m index 99e1750314..cf97a40bd2 100644 --- a/GraphBLAS/Test/make.m +++ b/GraphBLAS/Test/make.m @@ -80,11 +80,10 @@ function make (what) cfiles = [ dir('../Demo/Include/usercomplex.c') ; dir('GB_mx_*.c') ] ; hfiles = [ dir('*.h') ; dir('Template/*.c') ; dir('../Demo/Include/usercomplex.h') ] ; -inc = '-ITemplate -I../Include -I../Source -I../Source/Template -I../lz4 -I../rmm_wrap' ; +inc = '-ITemplate -I../Include -I../Source -I../lz4 -I../rmm_wrap' ; inc = [inc ' -I../zstd -I../zstd/zstd_subset -I.'] ; -inc = [inc ' -I../Source/Shared '] ; inc = [inc ' -I../Config '] ; -inc = [inc ' -I../Source/Factories '] ; +inc = [inc ' -I../Source/builtin '] ; if (ismac) % Mac (do 'make install' for GraphBLAS first) diff --git a/GraphBLAS/Test/test268.m b/GraphBLAS/Test/test268.m index 5ec3ac5ff9..a8f835f248 100644 --- a/GraphBLAS/Test/test268.m +++ b/GraphBLAS/Test/test268.m @@ -6,7 +6,7 @@ rng ('default') ; -% test Method04e, Factories/GB_sparse_masker_template.c +% test Method04e, GB_sparse_masker_template.c % when M(:,j) is much denser than Z(:,j) n = 1000 ; diff --git a/GraphBLAS/Test/unused/GB_mex_test23.c b/GraphBLAS/Test/unused/GB_mex_test23.c index 68c4970573..c0b2b435c1 100644 --- a/GraphBLAS/Test/unused/GB_mex_test23.c +++ b/GraphBLAS/Test/unused/GB_mex_test23.c @@ -9,7 +9,7 @@ #include "GB_mex.h" #include "GB_mex_errors.h" -#include "GB_stringify.h" +#include "../Source/jitifyer/GB_stringify.h" #define USAGE "GB_mex_test23" diff --git a/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake b/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake index a132e22c2e..de1ffa515a 100644 --- a/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake +++ b/GraphBLAS/cmake_modules/GraphBLAS_JIT_paths.cmake @@ -40,7 +40,7 @@ endif ( ) if ( SUITESPARSE_HAS_CUDA AND GRAPHBLAS_USE_CUDA ) # FOR NOW: do not compile FactoryKernels when developing the CUDA kernels - set ( GRAPHBLAS_COMPACT on ) +# set ( GRAPHBLAS_COMPACT on ) # FIXME endif ( ) option ( GRAPHBLAS_COMPACT "ON: do not compile FactoryKernels. OFF (default): compile FactoryKernels" OFF ) diff --git a/GraphBLAS/cmake_modules/GraphBLAS_version.cmake b/GraphBLAS/cmake_modules/GraphBLAS_version.cmake index 94076cf9e9..7f8d37c3ae 100644 --- a/GraphBLAS/cmake_modules/GraphBLAS_version.cmake +++ b/GraphBLAS/cmake_modules/GraphBLAS_version.cmake @@ -8,9 +8,9 @@ #------------------------------------------------------------------------------- # version of SuiteSparse:GraphBLAS -set ( GraphBLAS_DATE "May 22, 2024" ) +set ( GraphBLAS_DATE "June 1, 2024" ) set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE ) -set ( GraphBLAS_VERSION_MINOR 2 CACHE STRING "" FORCE ) +set ( GraphBLAS_VERSION_MINOR 3 CACHE STRING "" FORCE ) set ( GraphBLAS_VERSION_SUB 0 CACHE STRING "" FORCE ) # GraphBLAS C API Specification version, at graphblas.org @@ -27,3 +27,23 @@ message ( STATUS "GraphBLAS C API: v" ${GraphBLAS_API_VERSION_MAJOR}.${GraphBLAS_API_VERSION_MINOR} ", date: ${GraphBLAS_API_DATE}" ) +# Notes from Sebastien Villemot (sebastien@debian.org): +# SOVERSION policy: if a binary compiled against the old version of the shared +# library needs recompiling in order to work with the new version, then a +# SO_VERSION increase # is needed. Otherwise not. Examples of the changes that +# require a SO_VERSION increase: +# +# - a public function or static variable is removed +# - the prototype of a public function changes +# - the integer value attached to a public #define or enum changes +# - the fields of a public structure are modified +# +# Examples of changes that do not require a SO_VERSION increase: +# +# - a new public function or static variable is added +# - a private function or static variable is removed or modified +# - changes in the internals of a structure that is opaque to the calling +# program (i.e. is only a pointer manipulated through public functions of +# the library) +# - a public enum is extended (by adding a new item at the end, but without +# changing the already existing items) diff --git a/GraphBLAS/cmake_modules/SuiteSparseAtomic.cmake b/GraphBLAS/cmake_modules/SuiteSparseAtomic.cmake index 3b93432294..ddee335a93 100644 --- a/GraphBLAS/cmake_modules/SuiteSparseAtomic.cmake +++ b/GraphBLAS/cmake_modules/SuiteSparseAtomic.cmake @@ -50,7 +50,11 @@ if ( NOT TEST_FOR_STDATOMIC ) check_c_source_compiles ( "${atomic_source}" TEST_FOR_STDATOMIC_WITH_LIBATOMIC ) if ( NOT TEST_FOR_STDATOMIC_WITH_LIBATOMIC ) # fails with -latomic - message ( FATAL_ERROR "C11 atomics: failed" ) + string ( CONCAT ERR_MSG + "C11 atomics: failed.\n" + "Cannot build GraphBLAS with the used C compiler " + "(${CMAKE_C_COMPILER_ID}) and/or libraries." ) + message ( FATAL_ERROR "${ERR_MSG}" ) endif ( ) # source compiles but -latomic is required set ( LIBATOMIC_REQUIRED true ) diff --git a/GraphBLAS/cpu_features/README_for_GraphBLAS.txt b/GraphBLAS/cpu_features/README_for_GraphBLAS.txt index 0f90b14e74..83ae22259d 100644 --- a/GraphBLAS/cpu_features/README_for_GraphBLAS.txt +++ b/GraphBLAS/cpu_features/README_for_GraphBLAS.txt @@ -28,9 +28,9 @@ GraphBLAS does not use the cpu_features/CMakeLists.txt to build a separate library for cpu_features. Instead, in #include's all the source files and include files from cpu_features into these files: - ../Source/GB_cpu_features.h - ../Source/GB_cpu_features_impl.c - ../Source/GB_cpu_features_support.c + ../Source/cpu/GB_cpu_features.h + ../Source/cpu/GB_cpu_features_impl.c + ../Source/cpu/GB_cpu_features_support.c the cpu_features code is embedded in libgraphblas.so and libgraphblas.a directly diff --git a/README.md b/README.md index e384484816..2dcfa7cd60 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ SuiteSparse: A Suite of Sparse matrix packages at http://suitesparse.com ----------------------------------------------------------------------------- -Apr XX, 2024, SuiteSparse VERSION 7.8.0 +June XX, 2024, SuiteSparse VERSION 7.8.0 SuiteSparse is a set of sparse-matrix-related packages written or co-authored by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse . diff --git a/SPEX/CMakeLists.txt b/SPEX/CMakeLists.txt index 78d237e791..0625dd244b 100644 --- a/SPEX/CMakeLists.txt +++ b/SPEX/CMakeLists.txt @@ -13,7 +13,8 @@ cmake_minimum_required ( VERSION 3.22 ) -set ( SPEX_DATE "May XX, 2024" ) # FIXME NOW +set ( SPEX_DATE "June XX, 2024" ) # FIXME NOW +#FIXME NOW: use SPEX 3.2.0 for SuiteSparse 7.8.0: set ( SPEX_VERSION_MAJOR 3 CACHE STRING "" FORCE ) set ( SPEX_VERSION_MINOR 1 CACHE STRING "" FORCE ) set ( SPEX_VERSION_SUB 1 CACHE STRING "" FORCE ) diff --git a/SPEX/Doc/SPEX_version.tex b/SPEX/Doc/SPEX_version.tex index 23a6db8b79..f743b51a4f 100644 --- a/SPEX/Doc/SPEX_version.tex +++ b/SPEX/Doc/SPEX_version.tex @@ -1,2 +1,2 @@ % version of SuiteSparse/SPEX -VERSION 3.1.1, May XX, 2024 +VERSION 3.1.1, June XX, 2024 diff --git a/SPEX/Include/SPEX.h b/SPEX/Include/SPEX.h index 0120278fda..149e215504 100644 --- a/SPEX/Include/SPEX.h +++ b/SPEX/Include/SPEX.h @@ -106,7 +106,7 @@ //------------------------------------------------------------------------------ // Current version of the code -#define SPEX_DATE "May XX, 2024" +#define SPEX_DATE "June XX, 2024" #define SPEX_VERSION_STRING "3.1.1" #define SPEX_VERSION_MAJOR 3 #define SPEX_VERSION_MINOR 1 diff --git a/SPQR/CMakeLists.txt b/SPQR/CMakeLists.txt index 7cc7912e61..4d44cc2656 100644 --- a/SPQR/CMakeLists.txt +++ b/SPQR/CMakeLists.txt @@ -13,7 +13,7 @@ # cmake 3.22 is required to find the BLAS in SuiteSparsePolicy.cmake cmake_minimum_required ( VERSION 3.22 ) -set ( SPQR_DATE "Apr XX, 2024" ) +set ( SPQR_DATE "June XX, 2024" ) # FIXME NOW set ( SPQR_VERSION_MAJOR 4 CACHE STRING "" FORCE ) set ( SPQR_VERSION_MINOR 3 CACHE STRING "" FORCE ) set ( SPQR_VERSION_SUB 4 CACHE STRING "" FORCE ) diff --git a/SPQR/Doc/ChangeLog b/SPQR/Doc/ChangeLog index 6c7f7df01a..1a65a8a5aa 100644 --- a/SPQR/Doc/ChangeLog +++ b/SPQR/Doc/ChangeLog @@ -1,4 +1,4 @@ -Apr XX, 2024: version 4.4.0 FIXME NOW +June XX, 2024: version 4.4.0 FIXME NOW * minor changes from CHOLMOD 5.3.0 diff --git a/SPQR/Doc/spqr_user_guide.pdf b/SPQR/Doc/spqr_user_guide.pdf index df414fe2ef..c21ff4da0f 100644 Binary files a/SPQR/Doc/spqr_user_guide.pdf and b/SPQR/Doc/spqr_user_guide.pdf differ diff --git a/SPQR/Doc/spqr_version.tex b/SPQR/Doc/spqr_version.tex index 0f04846179..9c2a848109 100644 --- a/SPQR/Doc/spqr_version.tex +++ b/SPQR/Doc/spqr_version.tex @@ -1,2 +1,2 @@ % version of SuiteSparse/SPQR -\date{VERSION 4.3.4, Apr XX, 2024} +\date{VERSION 4.3.4, June XX, 2024} diff --git a/SPQR/GPUQREngine/Include/GPUQREngine.hpp b/SPQR/GPUQREngine/Include/GPUQREngine.hpp index 6446700b07..5b697aabd0 100644 --- a/SPQR/GPUQREngine/Include/GPUQREngine.hpp +++ b/SPQR/GPUQREngine/Include/GPUQREngine.hpp @@ -12,7 +12,7 @@ #define GPUQRENGINE_HPP // Version information: -#define GPUQRENGINE_DATE "Apr XX, 2024" +#define GPUQRENGINE_DATE "June XX, 2024" #define GPUQRENGINE_MAIN_VERSION 4 #define GPUQRENGINE_SUB_VERSION 3 #define GPUQRENGINE_SUBSUB_VERSION 4 diff --git a/SPQR/GPURuntime/Include/SuiteSparse_GPURuntime.hpp b/SPQR/GPURuntime/Include/SuiteSparse_GPURuntime.hpp index 6901c86653..62719e2898 100644 --- a/SPQR/GPURuntime/Include/SuiteSparse_GPURuntime.hpp +++ b/SPQR/GPURuntime/Include/SuiteSparse_GPURuntime.hpp @@ -12,7 +12,7 @@ #define SUITESPARSE_GPURUNTIME_HPP // Version information: -#define SUITESPARSE_GPURUNTIME_DATE "Apr XX, 2024" +#define SUITESPARSE_GPURUNTIME_DATE "June XX, 2024" #define SUITESPARSE_GPURUNTIME_MAIN_VERSION 4 #define SUITESPARSE_GPURUNTIME_SUB_VERSION 3 #define SUITESPARSE_GPURUNTIME_SUBSUB_VERSION 4 diff --git a/SPQR/Include/SuiteSparseQR_definitions.h b/SPQR/Include/SuiteSparseQR_definitions.h index 99802273dd..9c24fc8fa3 100644 --- a/SPQR/Include/SuiteSparseQR_definitions.h +++ b/SPQR/Include/SuiteSparseQR_definitions.h @@ -64,7 +64,7 @@ #endif */ -#define SPQR_DATE "Apr XX, 2024" +#define SPQR_DATE "June XX, 2024" #define SPQR_MAIN_VERSION 4 #define SPQR_SUB_VERSION 3 #define SPQR_SUBSUB_VERSION 4 diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt index ce8f5b93da..eb3c85dead 100644 --- a/SuiteSparse_config/CMakeLists.txt +++ b/SuiteSparse_config/CMakeLists.txt @@ -15,7 +15,7 @@ cmake_minimum_required ( VERSION 3.22 ) # version of both SuiteSparse and SuiteSparse_config -set ( SUITESPARSE_DATE "Apr XX, 2024" ) # FIXME NOW +set ( SUITESPARSE_DATE "June XX, 2024" ) # FIXME NOW set ( SUITESPARSE_VERSION_MAJOR 7 ) set ( SUITESPARSE_VERSION_MINOR 8 ) set ( SUITESPARSE_VERSION_SUB 0 ) diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h index 6a6658be47..ea74cea254 100644 --- a/SuiteSparse_config/SuiteSparse_config.h +++ b/SuiteSparse_config/SuiteSparse_config.h @@ -420,7 +420,7 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION #define SUITESPARSE_HAS_VERSION_FUNCTION -#define SUITESPARSE_DATE "Apr XX, 2024" +#define SUITESPARSE_DATE "June XX, 2024" #define SUITESPARSE_MAIN_VERSION 7 #define SUITESPARSE_SUB_VERSION 8 #define SUITESPARSE_SUBSUB_VERSION 0 diff --git a/UMFPACK/Config/umfpack.h.in b/UMFPACK/Config/umfpack.h.in index f5a73ba09b..ac8c9bda34 100644 --- a/UMFPACK/Config/umfpack.h.in +++ b/UMFPACK/Config/umfpack.h.in @@ -126,8 +126,8 @@ #define UMFPACK_SIZE_OF_ENTRY 7 /* sizeof (Entry), real or complex */ #define UMFPACK_NDENSE_ROW 8 /* number of dense rows */ #define UMFPACK_NEMPTY_ROW 9 /* number of empty rows */ -#define UMFPACK_NDENSE_COL 10 /* number of dense rows */ -#define UMFPACK_NEMPTY_COL 11 /* number of empty rows */ +#define UMFPACK_NDENSE_COL 10 /* number of dense cols */ +#define UMFPACK_NEMPTY_COL 11 /* number of empty cols */ #define UMFPACK_SYMBOLIC_DEFRAG 12 /* # of memory compactions */ #define UMFPACK_SYMBOLIC_PEAK_MEMORY 13 /* memory used by symbolic analysis */ #define UMFPACK_SYMBOLIC_SIZE 14 /* size of Symbolic object, in Units */